diff options
| author | Zach Copley <zach@status.net> | 2009-10-16 23:42:02 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-10-16 23:42:02 +0000 |
| commit | 0bbc05c1d57b0471c1d1f33ad0d1e00cd7d57e5c (patch) | |
| tree | 3536179ac3bdafd7c00897ec5915863ad544e455 /lib | |
| parent | 0fd8e758ade32204b452cc9fd40e071f0ec8c0f6 (diff) | |
| parent | e48efd322279fd67168957635fa30cf4cb46f81b (diff) | |
Merge branch '0.9.x' into TwitterBridgePlugin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.php | 2 | ||||
| -rw-r--r-- | lib/facebookutil.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/default.php b/lib/default.php index 329b041e9..9f3d4b1f9 100644 --- a/lib/default.php +++ b/lib/default.php @@ -157,7 +157,7 @@ $default = 'ping' => array('notify' => array()), 'inboxes' => - array('enabled' => true), # on by default for new sites + array('enabled' => true), # ignored after 0.9.x 'newuser' => array('default' => null, 'welcome' => null), diff --git a/lib/facebookutil.php b/lib/facebookutil.php index f5121609d..c991c5439 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -99,8 +99,8 @@ function facebookBroadcastNotice($notice) // XXX: Does this call count against our per user FB request limit? // If so we should consider storing verb elsewhere or not storing - $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, - $fbuid); + $prefix = trim($facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, + $fbuid)); $status = "$prefix $notice->content"; |