From e23ad7392fa0a84a3cea2f50b0f96e4ba68a372b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 8 Oct 2010 11:01:13 -0700
Subject: [PATCH] Normalize execution guards in imap plugin files.

---
 plugins/Imap/imapmailhandler.php | 4 +++-
 plugins/Imap/imapmanager.php     | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/Imap/imapmailhandler.php b/plugins/Imap/imapmailhandler.php
index 3d4b6113a9..92abf64747 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 e2f8c6d543..a9e531e1ae 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;