diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /plugins/Imap/imapmanager.php | |
parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'plugins/Imap/imapmanager.php')
-rw-r--r-- | plugins/Imap/imapmanager.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php index cfc08c1ee..c49c06092 100644 --- a/plugins/Imap/imapmanager.php +++ b/plugins/Imap/imapmanager.php @@ -44,7 +44,7 @@ class ImapManager extends IoManager */ public static function get() { - throw new Exception('ImapManager should be created using it\'s constructor, not the static get method'); + throw new Exception(_m('ImapManager should be created using its constructor, not the using the static get method.')); } /** @@ -94,12 +94,12 @@ class ImapManager extends IoManager { return $this->check_mailbox() > 0; } - + function pollInterval() { return $this->plugin->poll_frequency; } - + protected function connect() { $this->conn = imap_open($this->plugin->mailbox, $this->plugin->user, $this->plugin->password); |