Merge commit 'refs/merge-requests/29' of https://gitorious.org/social/mainline into...

[quix0rs-gnu-social.git] / scripts / importtwitteratom.php

diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php
index 261dfb1d02b7af595d628632eec97f1af2947cb4..d121179f47a9e45e0fa1777d0d9f9c29c419b499 100644 (file)
--- a/scripts/importtwitteratom.php
+++ b/scripts/importtwitteratom.php
@@ -33,7 +33,7 @@ import an Atom feed from Twitter as notices by a user
 
 END_OF_IMPORTTWITTERATOM_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
 
 function getAtomFeedDocument()
@@ -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,