now the installer checks for iconv module as well #2506

[friendica.git] / mod / parse_url.php

diff --git a/mod/parse_url.php b/mod/parse_url.php
index bf111f143c69d053716da3ceb71671c1a69ff89b..baf86775010a8360a7e09c451efc3f3ee3303905 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -72,8 +72,11 @@ function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = tr
 
        $data = parseurl_getsiteinfo($url, $no_guessing, $do_oembed);
 
-       q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')",
-               dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed), dbesc(serialize($data)), dbesc(datetime_convert()));
+       q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')
+                ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+               dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed),
+               dbesc(serialize($data)), dbesc(datetime_convert()),
+               dbesc(serialize($data)), dbesc(datetime_convert()));
 
        return $data;
 }
@@ -232,10 +235,9 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
                }
        }
 
-       //$list = $xpath->query("head/title");
        $list = $xpath->query("//title");
-       foreach ($list as $node)
-               $siteinfo["title"] =  html_entity_decode($node->nodeValue, ENT_QUOTES, "UTF-8");
+       if ($list->length > 0)
+               $siteinfo["title"] = $list->item(0)->nodeValue;
 
        //$list = $xpath->query("head/meta[@name]");
        $list = $xpath->query("//meta[@name]");
@@ -488,7 +490,14 @@ function parse_url_content(&$a) {
 
        unset($siteinfo["keywords"]);
 
-       echo add_page_info_data($siteinfo);
+       $info = add_page_info_data($siteinfo);
+
+       if (!$textmode)
+               // Replace ' with ’ - not perfect - but the richtext editor has problems otherwise
+               $info = str_replace(array("'"), array("’"), $info);
+
+       echo $info;
+
        killme();
 }
 ?>