diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /plugins/FBConnect/FBC_XDReceiver.php | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'plugins/FBConnect/FBC_XDReceiver.php')
| -rw-r--r-- | plugins/FBConnect/FBC_XDReceiver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/FBConnect/FBC_XDReceiver.php b/plugins/FBConnect/FBC_XDReceiver.php index 19251cca4..2bc790d5a 100644 --- a/plugins/FBConnect/FBC_XDReceiver.php +++ b/plugins/FBConnect/FBC_XDReceiver.php @@ -1,6 +1,6 @@ <?php -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } |