diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:14:33 -0700 |
commit | b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3 (patch) | |
tree | f63f4f3e93bad7611f4b5651171fc5122ec65455 /plugins/TwitterBridge/twitter.php | |
parent | 3b6f738ab73b7f77dd09ac21dd9446876776fc04 (diff) | |
parent | ca489631db840e33757a71a7e4cb56b187c182d3 (diff) |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'plugins/TwitterBridge/twitter.php')
-rw-r--r-- | plugins/TwitterBridge/twitter.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index f913e4aea..cd1ad70b9 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -282,15 +282,14 @@ function process_error($e, $flink, $notice) function format_status($notice) { - // XXX: Hack to get around PHP cURL's use of @ being a a meta character - $statustxt = preg_replace('/^@/', ' @', $notice->content); + // Start with the plaintext source of this notice... + $statustxt = $notice->content; // Convert !groups to #hashes - // XXX: Make this an optional setting? - $statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt); + // Twitter still has a 140-char hardcoded max. if (mb_strlen($statustxt) > 140) { $noticeUrl = common_shorten_url($notice->uri); $urlLen = mb_strlen($noticeUrl); |