From df86aa721455fde537608d5faeaaf92075afb738 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 26 Aug 2009 10:41:36 -0400 Subject: define LACONICA and accept LACONICA for backwards compatibility --- classes/Design.php | 2 +- classes/File.php | 2 +- classes/File_oembed.php | 2 +- classes/File_redirection.php | 2 +- classes/File_thumbnail.php | 2 +- classes/File_to_post.php | 2 +- classes/Group_alias.php | 2 +- classes/Group_block.php | 2 +- classes/Memcached_DataObject.php | 2 +- classes/Notice.php | 2 +- classes/Notice_inbox.php | 2 +- classes/Profile.php | 2 +- classes/Profile_block.php | 2 +- classes/Remote_profile.php | 2 +- classes/Session.php | 2 +- classes/Status_network.php | 2 +- classes/Subscription.php | 2 +- classes/User.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) (limited to 'classes') diff --git a/classes/Design.php b/classes/Design.php index c4820bf1e..89ae50c8c 100644 --- a/classes/Design.php +++ b/classes/Design.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/classes/File.php b/classes/File.php index 063c16425..0cebfc55e 100644 --- a/classes/File.php +++ b/classes/File.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/File_redirection.php'; diff --git a/classes/File_oembed.php b/classes/File_oembed.php index c28f5c396..6be651815 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 832d66b2b..76b18f672 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/File.php'; diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php index 2c0689f94..f8b70356c 100644 --- a/classes/File_thumbnail.php +++ b/classes/File_thumbnail.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/File_to_post.php b/classes/File_to_post.php index ea5751042..e3db91b20 100644 --- a/classes/File_to_post.php +++ b/classes/File_to_post.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Group_alias.php b/classes/Group_alias.php index 93bb75796..be3d0a6c6 100644 --- a/classes/Group_alias.php +++ b/classes/Group_alias.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Group_block.php b/classes/Group_block.php index bd8b24926..de2cf5f6e 100644 --- a/classes/Group_block.php +++ b/classes/Group_block.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index e2935cfc5..9c2ac3e01 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Notice.php b/classes/Notice.php index 607f35571..e59712864 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for notice diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index 60f11cd71..d3e7853b1 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Profile.php b/classes/Profile.php index 982415753..6ad0e7a3a 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for profile diff --git a/classes/Profile_block.php b/classes/Profile_block.php index b218244e3..2d87edaa0 100644 --- a/classes/Profile_block.php +++ b/classes/Profile_block.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for profile_block diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php index 9d100412a..9f7bfeadc 100644 --- a/classes/Remote_profile.php +++ b/classes/Remote_profile.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for remote_profile diff --git a/classes/Session.php b/classes/Session.php index 04958b61d..d641edbbe 100644 --- a/classes/Session.php +++ b/classes/Session.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Status_network.php b/classes/Status_network.php index e91bba1ac..d526cb4d6 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class Status_network extends DB_DataObject { diff --git a/classes/Subscription.php b/classes/Subscription.php index 0e2b5a307..fedfd5f19 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for subscription diff --git a/classes/User.php b/classes/User.php index 529957649..14d3cf54f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -- cgit v1.2.3-54-g00ecf