From bde467d8da9fd78b169d58ece3e87ea99c6d3e68 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 24 Jun 2014 05:59:46 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 plugins/jqueryui/config.inc.php.dist |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c0175..8e111e0 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -1,11 +1,12 @@
 <?php
 
 // if you want to load localization strings for specific sub-libraries of jquery-ui, configure them here 
-$rcmail_config['jquery_ui_i18n'] = array('datepicker');
+$config['jquery_ui_i18n'] = array('datepicker');
 
 // map Roundcube skins with jquery-ui themes here
-$rcmail_config['jquery_ui_skin_map'] = array(
+$config['jquery_ui_skin_map'] = array(
   'larry' => 'larry',
+  'default' => 'larry',
   'groupvice4' => 'redmond',
 );
 

--
Gitblit v1.9.1