diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-08 11:28:51 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-08 11:28:51 -0700 |
commit | 67dc78b6218bce86f6b783c34e02775f5b8cb21f (patch) | |
tree | f199a709506c736174dc64a1578c0c09134ddd4c /plugins/Facebook | |
parent | 781075d4bc74296118bbf6f64565ab3aeb0a3a86 (diff) | |
parent | 34e9549756102dccd9069fc6156f1c28839801e8 (diff) |
Merge branch 'fatals' into 0.9.x
Diffstat (limited to 'plugins/Facebook')
-rw-r--r-- | plugins/Facebook/FBConnectAuth.php | 4 | ||||
-rw-r--r-- | plugins/Facebook/facebookremove.php | 6 | ||||
-rw-r--r-- | plugins/Facebook/facebookutil.php | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php index f06dffaaa..d6d378626 100644 --- a/plugins/Facebook/FBConnectAuth.php +++ b/plugins/Facebook/FBConnectAuth.php @@ -27,6 +27,10 @@ * @link http://status.net/ */ +if (!defined('STATUSNET')) { + exit(1); +} + require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php'; class FBConnectauthAction extends Action diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php index b048a435f..bc76daaef 100644 --- a/plugins/Facebook/facebookremove.php +++ b/plugins/Facebook/facebookremove.php @@ -48,6 +48,12 @@ class FacebookremoveAction extends FacebookAction $flink = Foreign_link::getByForeignID($this->arg('fb_sig_user'), 2); + if (!$flink) { + common_log(LOG_ERR, "Tried to delete missing foreign_link entry with Facebook ID " . $this->arg('fb_sig_user')); + $this->serverError(_m('Couldn\'t remove Facebook user: already deleted.')); + return; + } + common_debug("Removing foreign link to Facebook - local user ID: $flink->user_id, Facebook ID: $flink->foreign_id"); $result = $flink->delete(); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index e78856f7c..fb70c51bc 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -17,6 +17,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +if (!defined('STATUSNET')) { + exit(1); +} + require_once INSTALLDIR . '/plugins/Facebook/facebook/facebook.php'; require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php'; require_once INSTALLDIR . '/lib/noticelist.php'; |