Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / plugins / Imap / imapmanager.php

diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php
index a9e531e1ae60db4d67df7cdc7a02dbc9738596bb..2d27ac97a87ecb37cdfa794e4726aa0007f4fa24 100644 (file)
--- a/plugins/Imap/imapmanager.php
+++ b/plugins/Imap/imapmanager.php
@@ -63,12 +63,14 @@ class ImapManager extends IoManager
     }
 
     /**
-     * Tell the i/o master we need one instance for each supporting site
-     * being handled in this process.
+     * Tell the i/o master we need one instance globally.
+     * Since this is a plugin manager, the plugin class itself will
+     * create one instance per site. This prevents the IoMaster from
+     * making more instances.
      */
     public static function multiSite()
     {
-        return IoManager::INSTANCE_PER_SITE;
+        return IoManager::GLOBAL_SINGLE_ONLY;
     }
 
     /**