From 3f9d1756d12e15d11bd44317b38e8006429fcf69 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 21 May 2012 20:21:06 +0200
Subject: Fix merged change s/rcube/rcmail/

---
 program/include/rcube_imap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcube_imap.php')

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 0374d08d6..5ead4668a 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2670,7 +2670,7 @@ class rcube_imap extends rcube_storage
             return array();
         }
 
-        $config = rcube::get_instance()->config;
+        $config = rcmail::get_instance()->config;
 
         // #1486796: some server configurations doesn't return folders in all namespaces
         if ($root == '' && $name == '*' && $config->get('imap_force_ns')) {
-- 
cgit v1.2.3