GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.

Browse Source
This commit is contained in:
Brion Vibber 2010-09-30 11:29:31 -07:00
parent 91f25ca817
commit 1acc7d66c6
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activityobject.php
View File

@ -203,7 +203,7 @@ class ActivityObject
$title = ActivityUtils::childHtmlContent($element, self::TITLE); $title = ActivityUtils::childHtmlContent($element, self::TITLE);
$this->title = html_entity_decode(strip_tags($title)); $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
$this->source = $this->_getSource($element); $this->source = $this->_getSource($element);

4
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -558,7 +558,7 @@ class Ostatus_profile extends Memcached_DataObject
// Get (safe!) HTML and text versions of the content // Get (safe!) HTML and text versions of the content
$rendered = $this->purify($sourceContent); $rendered = $this->purify($sourceContent);
$content = html_entity_decode(strip_tags($rendered)); $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
$shortened = common_shorten_links($content); $shortened = common_shorten_links($content);
@ -569,7 +569,7 @@ class Ostatus_profile extends Memcached_DataObject
if (Notice::contentTooLong($shortened)) { if (Notice::contentTooLong($shortened)) {
$attachment = $this->saveHTMLFile($note->title, $rendered); $attachment = $this->saveHTMLFile($note->title, $rendered);
$summary = html_entity_decode(strip_tags($note->summary)); $summary = html_entity_decode(strip_tags($note->summary), ENT_QUOTES, 'UTF-8');
if (empty($summary)) { if (empty($summary)) {
$summary = $content; $summary = $content;
} }

2
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
View File

@ -321,7 +321,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$notice->is_local = Notice::GATEWAY; $notice->is_local = Notice::GATEWAY;
$notice->content = html_entity_decode($status->text); $notice->content = html_entity_decode($status->text, ENT_QUOTES, 'UTF-8');
$notice->rendered = $this->linkify($status); $notice->rendered = $this->linkify($status);
if (Event::handle('StartNoticeSave', array(&$notice))) { if (Event::handle('StartNoticeSave', array(&$notice))) {

2
scripts/importtwitteratom.php
View File

@ -89,7 +89,7 @@ function importActivityStream($user, $doc)
$html = htmLawed($html, $config); $html = htmLawed($html, $config);
$content = html_entity_decode(strip_tags($html)); $content = html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8');
$notice = Notice::saveNew($user->id, $notice = Notice::saveNew($user->id,
$content, $content,

2
scripts/install_cli.php
View File

@ -208,7 +208,7 @@ END_HELP;
$breakout = preg_replace('/<a[^>+]\bhref="(.*)"[^>]*>(.*)<\/a>/', $breakout = preg_replace('/<a[^>+]\bhref="(.*)"[^>]*>(.*)<\/a>/',
'\2 &lt;\1&gt;', '\2 &lt;\1&gt;',
$html); $html);
return html_entity_decode(strip_tags($breakout)); return html_entity_decode(strip_tags($breakout), ENT_QUOTES, 'UTF-8');
} }
} }

2
scripts/restoreuser.php
View File

@ -213,7 +213,7 @@ function postNote($user, $activity)
// Get (safe!) HTML and text versions of the content // Get (safe!) HTML and text versions of the content
$rendered = purify($sourceContent); $rendered = purify($sourceContent);
$content = html_entity_decode(strip_tags($rendered)); $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
$shortened = common_shorten_links($content); $shortened = common_shorten_links($content);