summaryrefslogtreecommitdiff
path: root/lib/iomaster.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-18 01:48:41 +0000
committerZach Copley <zach@status.net>2010-02-18 01:48:41 +0000
commit5253a99d7abb27f7b17d6fdbc725498fbedd0aaa (patch)
tree9656596909537c7a80001e95b3c34cabe142f1dd /lib/iomaster.php
parent1aeca3947d7c938b9d14334d74f0fecd57a4eaf5 (diff)
parentce6be4f83624d8c39a93d2b54567cc2f33580812 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/iomaster.php')
-rw-r--r--lib/iomaster.php23
1 files changed, 7 insertions, 16 deletions
diff --git a/lib/iomaster.php b/lib/iomaster.php
index 54e2dfe84..d20837ba5 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -55,27 +55,18 @@ abstract class IoMaster
if ($multiSite !== null) {
$this->multiSite = $multiSite;
}
- if ($this->multiSite) {
- $this->sites = StatusNet::findAllSites();
- } else {
- $this->sites = array(StatusNet::currentSite());
- }
-
- if (empty($this->sites)) {
- throw new Exception("Empty status_network table, cannot init");
- }
- foreach ($this->sites as $site) {
- StatusNet::switchSite($site);
- $this->initManagers();
- }
+ $this->initManagers();
}
/**
- * Initialize IoManagers for the currently configured site
- * which are appropriate to this instance.
+ * Initialize IoManagers which are appropriate to this instance;
+ * pass class names or instances into $this->instantiate().
+ *
+ * If setup and configuration may vary between sites in multi-site
+ * mode, it's the subclass's responsibility to set them up here.
*
- * Pass class names into $this->instantiate()
+ * Switching site configurations is an acceptable side effect.
*/
abstract function initManagers();