Feature: support any tag separator

[github/shaarli/Shaarli.git] / application / http / MetadataRetriever.php

diff --git a/application/http/MetadataRetriever.php b/application/http/MetadataRetriever.php
index 2ca982e21172236fb7aaaf957f0db8c255725b32..2e1401eca74f0c9857d7d31c34934a14b6811066 100644 (file)
--- 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', ' ')
             )
         );