X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fhttp%2FMetadataRetriever.php;h=2e1401eca74f0c9857d7d31c34934a14b6811066;hb=b3bd8c3e8d367975980043e772f7cd78b7f96bc6;hp=2ca982e21172236fb7aaaf957f0db8c255725b32;hpb=4cf3564d28dc8e4d08a3e64f09ad045ffbde97ae;p=github%2Fshaarli%2FShaarli.git diff --git a/application/http/MetadataRetriever.php b/application/http/MetadataRetriever.php index 2ca982e2..2e1401ec 100644 --- a/application/http/MetadataRetriever.php +++ b/application/http/MetadataRetriever.php @@ -38,7 +38,6 @@ class MetadataRetriever $title = null; $description = null; $tags = null; - $retrieveDescription = $this->conf->get('general.retrieve_description'); // Short timeout to keep the application responsive // The callback will fill $charset and $title with data from the downloaded page. @@ -46,12 +45,14 @@ class MetadataRetriever $url, $this->conf->get('general.download_timeout', 30), $this->conf->get('general.download_max_size', 4194304), + $this->httpAccess->getCurlHeaderCallback($charset), $this->httpAccess->getCurlDownloadCallback( $charset, $title, $description, $tags, - $retrieveDescription + $this->conf->get('general.retrieve_description'), + $this->conf->get('general.tags_separator', ' ') ) );