From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 16 Jan 2009 21:24:52 +0000 (-0500)
Subject: $imp_imap is in the global scope
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1c5980856173e7813e3a915ada37c28c3fe7cb39;p=horde.git

$imp_imap is in the global scope
---

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index e1a0a132b..4567077eb 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -611,7 +611,7 @@ class IMP
                     }
                 }
 
-                if (!empty($mailbox) && !$imp_imap->isReadOnly($mailbox)) {
+                if (!empty($mailbox) && !$GLOBALS['imp_imap']->isReadOnly($mailbox)) {
                     $menu_trash_url = Util::addParameter(self::generateIMPUrl($menu_mailbox_url, $mailbox), array('actionID' => 'empty_mailbox', 'mailbox_token' => self::getRequestToken('imp.mailbox')));
                     $menu->add($menu_trash_url, _("Empty _Trash"), 'empty_trash.png', null, null, "return window.confirm('" . addslashes(_("Are you sure you wish to empty your trash folder?")) . "');", '__noselection');
                 }