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

Fix issue #171 with latent htmLawed reference

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-21 02:55:10 +01:00
parent b7c4c960e2
commit 78e23bd4ec
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/importtwitteratom.php
View File

@ -34,7 +34,6 @@ import an Atom feed from Twitter as notices by a user
END_OF_IMPORTTWITTERATOM_HELP; END_OF_IMPORTTWITTERATOM_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR.'/scripts/commandline.inc';
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
function getAtomFeedDocument() function getAtomFeedDocument()
{ {
@ -82,12 +81,7 @@ function importActivityStream($user, $doc)
if (!have_option('q', 'quiet')) { if (!have_option('q', 'quiet')) {
print $activity->content . "\n"; print $activity->content . "\n";
} }
$html = getTweetHtml($object->link); $html = common_purify(getTweetHtml($object->link));
$config = array('safe' => 1,
'deny_attribute' => 'class,rel,id,style,on*');
$html = htmLawed($html, $config);
$content = html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'); $content = html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8');

1
scripts/restoreuser.php
View File

@ -34,7 +34,6 @@ neither ID or name provided, will create a new user.
END_OF_RESTOREUSER_HELP; END_OF_RESTOREUSER_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR.'/scripts/commandline.inc';
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
function getActivityStreamDocument() function getActivityStreamDocument()