From cb16d146019fa85984696a47e9863e526803a62b Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sat, 18 Sep 2010 16:32:00 +0000
Subject: Prevent from saving a non-existing skin path in user prefs

git-svn-id: https://svn.roundcube.net/trunk@3974 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/show.inc           | 2 +-
 roundcubemail/program/steps/settings/save_prefs.inc | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/steps')

diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc
index 69b30eb4d..a9dbced90 100644
--- a/roundcubemail/program/steps/mail/show.inc
+++ b/roundcubemail/program/steps/mail/show.inc
@@ -29,7 +29,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
   if (empty($MESSAGE->headers)) {
     rcmail_message_error($uid);
   }
-
+sleep(5);
   send_nocacheing_headers();
 
   $mbox_name = $IMAP->get_mailbox_name();
diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc
index 3f13c0af4..a8ff87869 100644
--- a/roundcubemail/program/steps/settings/save_prefs.inc
+++ b/roundcubemail/program/steps/settings/save_prefs.inc
@@ -116,8 +116,9 @@ switch ($CURR_SECTION)
       $OUTPUT->command('reload', 500);
     }
 
-    // switch skin
-    $OUTPUT->set_skin($a_user_prefs['skin']);
+    // switch skin (if valid, otherwise unset the pref and fall back to default)
+    if (!$OUTPUT->set_skin($a_user_prefs['skin']))
+      unset($a_user_prefs['skin']);
 
     // force min size
     if ($a_user_prefs['pagesize'] < 1)
-- 
cgit v1.2.3