Merge branch 'site-notice' into 'nightly'

Site Notice: common_purify instead of HTMLPurifier

So that we can use our custom settings (e.g: extra URI schemes) in the
site notice textbox.

Ref. #170

See merge request !124
This commit is contained in:
mmn 2016-06-17 16:28:01 -04:00
commit cb8bf360c4
1 changed files with 1 additions and 3 deletions

View File

@ -110,9 +110,7 @@ class SitenoticeadminpanelAction extends AdminPanelAction
}
// scrub HTML input
require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
$purifier = new HTMLPurifier();
$siteNotice = $purifier->purify($siteNotice);
$siteNotice = common_purify($siteNotice);
}
}