summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/activityobject.php2
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php4
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php2
-rw-r--r--scripts/importtwitteratom.php2
-rwxr-xr-xscripts/install_cli.php2
-rw-r--r--scripts/restoreuser.php2
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 95615d581..c957933d0 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -203,7 +203,7 @@ class ActivityObject
$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);
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 047435f66..10cee917e 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -558,7 +558,7 @@ class Ostatus_profile extends Memcached_DataObject
// Get (safe!) HTML and text versions of the content
$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);
@@ -569,7 +569,7 @@ class Ostatus_profile extends Memcached_DataObject
if (Notice::contentTooLong($shortened)) {
$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)) {
$summary = $content;
}
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 590fa2954..cef67b180 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -321,7 +321,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$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);
if (Event::handle('StartNoticeSave', array(&$notice))) {
diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
index 261dfb1d0..a29526f27 100644
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -89,7 +89,7 @@ function importActivityStream($user, $doc)
$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,
$content,
diff --git a/scripts/install_cli.php b/scripts/install_cli.php
index 61fbe18ef..dadbcf66f 100755
--- a/scripts/install_cli.php
+++ b/scripts/install_cli.php
@@ -208,7 +208,7 @@ END_HELP;
$breakout = preg_replace('/<a[^>+]\bhref="(.*)"[^>]*>(.*)<\/a>/',
'\2 &lt;\1&gt;',
$html);
- return html_entity_decode(strip_tags($breakout));
+ return html_entity_decode(strip_tags($breakout), ENT_QUOTES, 'UTF-8');
}
}
diff --git a/scripts/restoreuser.php b/scripts/restoreuser.php
index de3816dd5..82eb9bbaa 100644
--- a/scripts/restoreuser.php
+++ b/scripts/restoreuser.php
@@ -213,7 +213,7 @@ function postNote($user, $activity)
// Get (safe!) HTML and text versions of the content
$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);