diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-08 11:47:50 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-08 11:47:50 -0700 |
commit | aa02f6020e16f722d5194ad97e66a57ab1d8c29c (patch) | |
tree | 6a820222c3984586ede7ec152288aa70d4124b29 /plugins/Imap | |
parent | 6c959c83ce528614f6e0837cf022d1a67b64b73c (diff) | |
parent | 67dc78b6218bce86f6b783c34e02775f5b8cb21f (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins/Imap')
-rw-r--r-- | plugins/Imap/imapmailhandler.php | 4 | ||||
-rw-r--r-- | plugins/Imap/imapmanager.php | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/Imap/imapmailhandler.php b/plugins/Imap/imapmailhandler.php index 3d4b6113a..92abf6474 100644 --- a/plugins/Imap/imapmailhandler.php +++ b/plugins/Imap/imapmailhandler.php @@ -17,7 +17,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET')) { + exit(1); +} class IMAPMailHandler extends MailHandler { diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php index c49c06092..2d27ac97a 100644 --- a/plugins/Imap/imapmanager.php +++ b/plugins/Imap/imapmanager.php @@ -29,6 +29,10 @@ * @link http://status.net/ */ +if (!defined('STATUSNET')) { + exit(1); +} + class ImapManager extends IoManager { protected $conn = null; |