Changeset 1743 for trunk/xmlrpc.php

Timestamp:

09/10/2008 07:44:37 PM (4 months ago)

Author:

driehle

Message:

Bugfix #194

Files:

• trunk/xmlrpc.php (modified) (3 diffs)

trunk/xmlrpc.php

@@ -110 +110 @@
                 $utf8 = 'application/xhtml+xml' == strtolower(trim($s->getResponseHeader("Content-Type")));
 
-            $this->title = empty($title[1]) ? $this->sourceURI : html_entity_decode($utf8 ? utf8_decode($title[1]) : $title[1]);
+            // since text in database is utf8 encoded, we need to *en*code the title to utf8 if it isn't already, not *de*code it
+            $this->title = empty($title[1]) ? $this->sourceURI : html_entity_decode($utf8 ? $title[1] : utf8_encode($title[1]));
         }
 
@@ -189 +190 @@
 
     function Jlog_SendPingback($html, $pagelinkedfrom, $useragent) {
-        $this->pagelinkedfrom = $pagelinkedfrom;
+        // neet to prevent & in url
+        $this->pagelinkedfrom = htmlspecialchars_decode($pagelinkedfrom);
         $this->useragent = $useragent;
 
@@ -198 +200 @@
         for($i = 0; $count > $i; $i++) {
             if(substr($pageslinkedto[$i], 0, 4) !== "http") unset($pageslinkedto[$i]);
-            else $pageslinkedto[$i] = str_replace(array('&quot;','&lt;', '&gt;', '&amp;'), array('"', '<', '>', '&'), $pageslinkedto[$i]);
+            // htmlspecialchars_decode is easier than str_replace
+            else $pageslinkedto[$i] = htmlspecialchars_decode($pageslinkedto[$i]);
         }
         $this->pageslinkedto = $pageslinkedto;