Merge branch '0.9.x' into 1.0.x

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;