From 272c49b8ca54267634f94d7fdde7c2c2040df165 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 16 Jan 2012 15:14:41 +0000
Subject: Merged devel-framework branch (r5746:5779) back into trunk

git-svn-id: https://svn.roundcube.net/trunk@5781 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 roundcubemail/program/include/rcube_template.php

(limited to 'roundcubemail/program/include/rcube_template.php')

diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
old mode 100755
new mode 100644
index 95f92a587..db14b3cda
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -804,8 +804,8 @@ class rcube_template extends rcube_html_page
                         break;
                     case 'config':
                         $value = $this->config[$name];
-                        if (is_array($value) && $value[$_SESSION['imap_host']]) {
-                            $value = $value[$_SESSION['imap_host']];
+                        if (is_array($value) && $value[$_SESSION['storage_host']]) {
+                            $value = $value[$_SESSION['storage_host']];
                         }
                         break;
                     case 'request':
-- 
cgit v1.2.3