Merge branch '0.9.x' into 1.0.x

2010-10-08 11:47:50 -07:00
parent 6c959c83ce 67dc78b621
commit aa02f6020e
38 changed files with 134 additions and 31 deletions
--- 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;