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

diff --combined lib/activityobject.php
index c957933d04bff8c2e11ba75552e58faeaabe4b81,52733c47a010d5dc489425c7989424e54eb7abd9..e89c8db4e9afee4e611a0e54d41ac150b9d14fc5
--- 1/lib/activityobject.php
--- 2/lib/activityobject.php
+++ b/lib/activityobject.php
@@@ -49,7 -49,6 +49,6 @@@ if (!defined('STATUSNET')) 
   * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
   * @link      http://status.net/
   */
- 
  class ActivityObject
  {
      const ARTICLE   = 'http://activitystrea.ms/schema/1.0/article';
@@@ -116,7 -115,6 +115,6 @@@
       *
       * @param DOMElement $element DOM thing to turn into an Activity thing
       */
- 
      function __construct($element = null)
      {
          if (empty($element)) {
@@@ -203,7 -201,7 +201,7 @@@
  
          $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);
  
@@@ -216,8 -214,7 +214,7 @@@
          }
      }
  
-     // @fixme rationalize with Activity::_fromRssItem()
- 
+     // @todo FIXME: rationalize with Activity::_fromRssItem()
      private function _fromRssItem($item)
      {
          $this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, Activity::RSS);