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

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source 
* 'testing' of gitorious.org:statusnet/mainline:
  Merge StatusNet core localization updates from 0.9.x branch
  Fix update_po_templates.php to support the plural and context variants of _m() in plugins
  Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
  OStatus: handle update-profile Salmon pings
  Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
  OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
This commit is contained in:
Zach Copley
2010-02-24 16:52:16 -08:00
parent 543ff40ef6 5173d92895
commit 10884dcd49
366 changed files with 40655 additions and 46085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,10 +668,9 @@ class Ostatus_profile extends Memcached_DataObject
*/
protected function purify($html)
{
// @fixme disable caching or set a sane temp dir
require_once(INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php');
$purifier = new HTMLPurifier();
return $purifier->purify($html);
require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
$config = array('safe' => 1);
return htmLawed($html, $config);
}
/**
@@ -953,7 +952,7 @@ class Ostatus_profile extends Memcached_DataObject
* @param Activity $activity
* @return mixed matching Ostatus_profile or false if none known
*/
protected static function getActorProfile($activity)
public static function getActorProfile($activity)
{
return self::getActivityObjectProfile($activity->actor);
}
@@ -1091,7 +1090,7 @@ class Ostatus_profile extends Memcached_DataObject
* @param ActivityObject $object
* @param array $hints
*/
protected function updateFromActivityObject($object, $hints=array())
public function updateFromActivityObject($object, $hints=array())
{
if ($this->isGroup()) {
$group = $this->localGroup();