diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-07-10 15:28:26 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-07-10 15:28:26 -0700 |
| commit | 49e4f958eb7ff89bfb237da9bf810a0d668104e0 (patch) | |
| tree | 85a66a8ba2aabe9bae288de7d4e59e1991502962 /actions/facebookhome.php | |
| parent | 36d2c66eee9ddc56acca5f9250521c7f96dfc92f (diff) | |
| parent | 4a1d7ad0829aeeece7a392ed64bce3d95c21f87e (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline:
When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.
Diffstat (limited to 'actions/facebookhome.php')
| -rw-r--r-- | actions/facebookhome.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php index 34989c978..6d8d0745d 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -57,7 +57,7 @@ class FacebookhomeAction extends FacebookAction // If this is the first time the user has started the app // prompt for Facebook status update permission - if (!$this->facebook->api_client->users_hasAppPermission('status_update')) { + if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) { if ($this->facebook->api_client->data_getUserPreference( FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') { @@ -203,7 +203,7 @@ class FacebookhomeAction extends FacebookAction $api_key = common_config('facebook', 'apikey'); $auth_url = 'http://www.facebook.com/authorize.php?api_key=' . - $api_key . '&v=1.0&ext_perm=status_update&next=' . $next . + $api_key . '&v=1.0&ext_perm=publish_stream&next=' . $next . '&next_cancel=' . $next . '&submit=skip'; $this->elementStart('span', array('class' => 'facebook-button')); |