diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
| commit | e05415f621890bbaf42752577249ecdc22c161fc (patch) | |
| tree | 9291f0eb1b6c0a57ffeaa7279d4316ab6041206d /plugins | |
| parent | 94190e77f664c06c76e650fdebd23720fe26bf6e (diff) | |
| parent | b50f300566143837aba3739d62caf679ec19727e (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/DirectionDetector/DirectionDetectorPlugin.php | 6 | ||||
| -rw-r--r-- | plugins/OStatus/lib/feeddiscovery.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 303e60d5f..34c511e21 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -38,7 +38,7 @@ class DirectionDetectorPlugin extends Plugin { * @param object $notice notice is going to be saved */ public function onStartNoticeSave(&$notice){ - if(self::isRTL($notice->content)) + if(!preg_match('/<span class="rtl">/', $notice->rendered) && self::isRTL($notice->content)) $notice->rendered = '<span class="rtl">'.$notice->rendered.'</span>'; return true; } @@ -48,7 +48,7 @@ class DirectionDetectorPlugin extends Plugin { * * @param */ - public function onEndShowStatusNetStyles(&$xml){ + public function onEndShowStatusNetStyles($xml){ $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}'); } /** @@ -102,7 +102,7 @@ class DirectionDetectorPlugin extends Plugin { * * Returns false if the input string isn't a valid UTF-8 octet sequence. */ - private static function utf8ToUnicode(&$str){ + private static function utf8ToUnicode($str){ $mState = 0; // cached expected number of octets after the current octet // until the beginning of the next UTF8 character sequence $mUcs4 = 0; // cached Unicode character diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php index 4809f9d35..4ac243832 100644 --- a/plugins/OStatus/lib/feeddiscovery.php +++ b/plugins/OStatus/lib/feeddiscovery.php @@ -104,7 +104,7 @@ class FeedDiscovery $response = $client->get($url); } catch (HTTP_Request2_Exception $e) { common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage()); - throw new FeedSubBadURLException($e); + throw new FeedSubBadURLException($e->getMessage()); } if ($htmlOk) { |