From df86aa721455fde537608d5faeaaf92075afb738 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 26 Aug 2009 10:41:36 -0400
Subject: define LACONICA and accept LACONICA for backwards compatibility

---
 actions/accesstoken.php            | 2 +-
 actions/all.php                    | 2 +-
 actions/allrss.php                 | 2 +-
 actions/api.php                    | 2 +-
 actions/attachment.php             | 2 +-
 actions/attachment_ajax.php        | 2 +-
 actions/attachment_thumbnail.php   | 2 +-
 actions/avatarbynickname.php       | 2 +-
 actions/avatarsettings.php         | 2 +-
 actions/block.php                  | 2 +-
 actions/blockedfromgroup.php       | 2 +-
 actions/confirmaddress.php         | 2 +-
 actions/conversation.php           | 2 +-
 actions/deletenotice.php           | 2 +-
 actions/disfavor.php               | 2 +-
 actions/doc.php                    | 2 +-
 actions/editgroup.php              | 2 +-
 actions/emailsettings.php          | 2 +-
 actions/facebookhome.php           | 2 +-
 actions/facebookinvite.php         | 2 +-
 actions/facebooklogin.php          | 2 +-
 actions/facebookremove.php         | 2 +-
 actions/facebooksettings.php       | 2 +-
 actions/favor.php                  | 2 +-
 actions/favorited.php              | 2 +-
 actions/favoritesrss.php           | 2 +-
 actions/featured.php               | 2 +-
 actions/file.php                   | 2 +-
 actions/finishaddopenid.php        | 2 +-
 actions/finishopenidlogin.php      | 2 +-
 actions/finishremotesubscribe.php  | 2 +-
 actions/foaf.php                   | 2 +-
 actions/groupblock.php             | 2 +-
 actions/groupbyid.php              | 2 +-
 actions/groupdesignsettings.php    | 2 +-
 actions/grouplogo.php              | 2 +-
 actions/groupmembers.php           | 2 +-
 actions/grouprss.php               | 2 +-
 actions/groups.php                 | 2 +-
 actions/groupsearch.php            | 2 +-
 actions/groupunblock.php           | 2 +-
 actions/imsettings.php             | 2 +-
 actions/inbox.php                  | 2 +-
 actions/invite.php                 | 2 +-
 actions/joingroup.php              | 2 +-
 actions/leavegroup.php             | 2 +-
 actions/login.php                  | 2 +-
 actions/logout.php                 | 2 +-
 actions/makeadmin.php              | 2 +-
 actions/microsummary.php           | 2 +-
 actions/newgroup.php               | 2 +-
 actions/newmessage.php             | 2 +-
 actions/newnotice.php              | 2 +-
 actions/noticesearch.php           | 2 +-
 actions/noticesearchrss.php        | 2 +-
 actions/nudge.php                  | 2 +-
 actions/oembed.php                 | 2 +-
 actions/openidlogin.php            | 2 +-
 actions/openidsettings.php         | 2 +-
 actions/opensearch.php             | 2 +-
 actions/othersettings.php          | 2 +-
 actions/outbox.php                 | 2 +-
 actions/passwordsettings.php       | 2 +-
 actions/peoplesearch.php           | 2 +-
 actions/peopletag.php              | 2 +-
 actions/postnotice.php             | 2 +-
 actions/profilesettings.php        | 2 +-
 actions/public.php                 | 2 +-
 actions/publicrss.php              | 2 +-
 actions/publictagcloud.php         | 2 +-
 actions/publicxrds.php             | 2 +-
 actions/recoverpassword.php        | 2 +-
 actions/register.php               | 2 +-
 actions/remotesubscribe.php        | 2 +-
 actions/replies.php                | 2 +-
 actions/repliesrss.php             | 2 +-
 actions/requesttoken.php           | 2 +-
 actions/showfavorites.php          | 2 +-
 actions/showgroup.php              | 2 +-
 actions/showmessage.php            | 2 +-
 actions/shownotice.php             | 2 +-
 actions/showstream.php             | 2 +-
 actions/smssettings.php            | 2 +-
 actions/subedit.php                | 2 +-
 actions/subscribe.php              | 2 +-
 actions/subscribers.php            | 2 +-
 actions/subscriptions.php          | 4 ++--
 actions/sup.php                    | 2 +-
 actions/tag.php                    | 2 +-
 actions/tagother.php               | 2 +-
 actions/tagrss.php                 | 2 +-
 actions/twitapiaccount.php         | 2 +-
 actions/twitapiblocks.php          | 2 +-
 actions/twitapidirect_messages.php | 2 +-
 actions/twitapifavorites.php       | 2 +-
 actions/twitapifriendships.php     | 2 +-
 actions/twitapigroups.php          | 2 +-
 actions/twitapihelp.php            | 2 +-
 actions/twitapinotifications.php   | 2 +-
 actions/twitapisearchatom.php      | 2 +-
 actions/twitapisearchjson.php      | 2 +-
 actions/twitapistatuses.php        | 2 +-
 actions/twitapistatusnet.php       | 2 +-
 actions/twitapitags.php            | 2 +-
 actions/twitapitrends.php          | 2 +-
 actions/twitapiusers.php           | 2 +-
 actions/twitterauthorization.php   | 2 +-
 actions/twittersettings.php        | 2 +-
 actions/unblock.php                | 2 +-
 actions/unsubscribe.php            | 2 +-
 actions/updateprofile.php          | 2 +-
 actions/userauthorization.php      | 2 +-
 actions/userbyid.php               | 2 +-
 actions/userdesignsettings.php     | 2 +-
 actions/usergroups.php             | 2 +-
 actions/userrss.php                | 2 +-
 actions/xrds.php                   | 2 +-
 117 files changed, 118 insertions(+), 118 deletions(-)

(limited to 'actions')

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index f1ddfc6a1..c99aaeded 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/all.php b/actions/all.php
index 6dbab080f..bfde3a7e4 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
diff --git a/actions/allrss.php b/actions/allrss.php
index a5447fa9f..57efb73f0 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/api.php b/actions/api.php
index 91f30e87a..93e33085f 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class ApiAction extends Action
 {
diff --git a/actions/attachment.php b/actions/attachment.php
index 5d11faad8..6981354d1 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index af37c9bcb..1e0728075 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 7add8e278..7d0ac97a6 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index e7ebaeee2..537950792 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 54baef88f..0bc439ff1 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/block.php b/actions/block.php
index 2441c6fba..408f16434 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 5b5c8bcfa..ca4a711cb 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 94cd6ddf4..201694286 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/conversation.php b/actions/conversation.php
index c4a4e80da..900a724ef 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 8f6e9bdd1..3d040f2fa 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 25230ceac..6269f1bd2 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/doc.php b/actions/doc.php
index 1adb9b075..68295234c 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/editgroup.php b/actions/editgroup.php
index 62a629056..cac910e9b 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 1b4d73bbf..af528a892 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index a54d22a47..70f205205 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index aa8486585..6dfc9d688 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index 64d24dd40..8ac2477ab 100644
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index 1547fb780..ae231c0fb 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 817a11828..84bdde910 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/favor.php b/actions/favor.php
index a995188c3..2aeb1da61 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 006dd5488..5ba508cdf 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 0302d10e5..2d5ce9854 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/featured.php b/actions/featured.php
index f38068eb6..39bf09d8f 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/file.php b/actions/file.php
index 005a13169..10c59a961 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/shownotice.php');
 
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 40939d44b..b6de4f244 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 07da72fc0..9ac036985 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 5df36070f..871bc3d2d 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/foaf.php b/actions/foaf.php
index d3ab098f4..4dae9dfc1 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('LISTENER', 1);
 define('LISTENEE', -1);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index e98f13224..979a56a81 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index bc0709f4f..52cfaddfc 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index baef31018..cd86e3b05 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 30f865248..c6f376915 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 5a4ea27ab..dcbdd3759 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 7cd85c1af..70c1ded48 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groups.php b/actions/groups.php
index 53b95c848..10a1d5964 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index fc825a6fd..bbd4c3a74 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 248b2a0a7..dd6b15c26 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 145cd7ed2..f57933b43 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/inbox.php b/actions/inbox.php
index f5f7d8bcb..6cb7f9e15 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/invite.php b/actions/invite.php
index d8f15705b..ab43a2491 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class InviteAction extends CurrentUserDesignAction
 {
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 32b59efa0..0209dd43f 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 27b5ea017..60b22e147 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/login.php b/actions/login.php
index 145236966..37f3c54ff 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/logout.php b/actions/logout.php
index eda5cefe5..298b2a484 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 7866f42c1..2dfddebc2 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 8f2d34998..5c01a9ce0 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 544dd3818..01cb636aa 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 579871546..828a339cf 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 4b542815b..00a822860 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index e268c69ab..1188e7e10 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 67bca01b5..f59ad7962 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/nudge.php b/actions/nudge.php
index b699a3144..cf5f773e7 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/oembed.php b/actions/oembed.php
index 5f6751b5a..e287b6ae2 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 42d740938..4b5338694 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 09e678e3c..13da64a4f 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 8ef13dd7a..d5e6698f3 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 244c34eab..8b674161a 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/outbox.php b/actions/outbox.php
index a1fc81dfd..537fad3ef 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index e7cd0ab51..ec842600f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 43c966f9c..ba0f71e39 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 0c5321fae..6dbbc9261 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index 883cd53fb..e775ca17e 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 2f9d2bac9..f9c16351d 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/public.php b/actions/public.php
index f8ecc0e78..d426648f3 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 0d75ffc35..593888b9f 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 026827fbe..60bb53e27 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('TAGS_PER_PAGE', 100);
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 921106a5f..209a10e3d 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 279f1cef1..9776c1fb4 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 # You have 24 hours to claim your password
 
diff --git a/actions/register.php b/actions/register.php
index a219c03d8..c431aeee3 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 793275781..374392d4a 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/replies.php b/actions/replies.php
index 954d7ce19..cca430230 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 5115453b7..c71c9226f 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 243844c4b..48fe1db08 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 9734496ba..0f7a66330 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 965b933e2..8157ee3c8 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showmessage.php b/actions/showmessage.php
index 5d23fb13f..db757948b 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -26,7 +26,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-if (!defined('STATUSNET')) { 
+if (!defined('STATUSNET') && !defined('LACONICA')) { 
     exit(1); 
 }
 
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 4f7c3af7f..3bc52b2db 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 93730812c..4d3067eed 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/smssettings.php b/actions/smssettings.php
index bfe49feee..b956cceba 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/subedit.php b/actions/subedit.php
index 3320bdc59..cf6589e50 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubeditAction extends Action
 {
diff --git a/actions/subscribe.php b/actions/subscribe.php
index fb1fb5e6b..4c46806e4 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action
 {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 3000f17b0..f7d08d9d0 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 8cad9e3b4..b1c668228 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @link     http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubscriptionsAction extends GalleryAction
 {
diff --git a/actions/sup.php b/actions/sup.php
index b635de194..5daf0a1c1 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SupAction extends Action
 {
diff --git a/actions/tag.php b/actions/tag.php
index 935d00ab0..f0ab30308 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class TagAction extends Action
 {
diff --git a/actions/tagother.php b/actions/tagother.php
index aaca46355..c3f43be8b 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 135b12135..75cbfa274 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index dc043ddd3..93c8443c9 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 808e79220..ed17946ae 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 8511fcbe2..dbe55804b 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index d812b5034..f8943fe2d 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 015a5dbae..f2ea46910 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index c3e028c17..214fa8214 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 3fc232f64..81381620e 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index 7bc9dd14b..0653e69ab 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 3ccd8c5b6..2f587d604 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 173295176..c628ee624 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index e522b6357..edee239a0 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index c75e5e858..490f11dce 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 0f2b571c6..2bb7ee01a 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 436451c0f..83ab28f35 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 853a6b8fa..703fa6754 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 3745a67cf..630ac426f 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index c23fa2ff8..563d867a4 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/unblock.php b/actions/unblock.php
index 43f454340..dc28d5d54 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bedea9f28..4a5863489 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index d48686401..9a4cf8e46 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 38329a2c7..a9ac1f256 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 4ed78688b..802bcb081 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 07d160984..568c1d624 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 7cdc132b8..84e105153 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/userrss.php b/actions/userrss.php
index 1437a4c22..fa6d588cd 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/xrds.php b/actions/xrds.php
index 86f7d7616..def10e4cf 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-- 
cgit v1.2.3-54-g00ecf