- Fix displaying of hidden directories in skins list (#1486301)

- Fix open_basedir restriction error when reading skins list (#1486304)

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8d43e6aca..2bfc11f30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix displaying of hidden directories in skins list (#1486301)
+- Fix open_basedir restriction error when reading skins list (#1486304)
 - Fix pasting from Office apps into html editor (#1486271)
 - Fix empty <A> tags parsing (#1486272)
 - Don't cut off attachment names when using non-RFC2231 encoding (#1485515)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index fc1755665..a2175b0f0 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -640,8 +640,7 @@ function rcmail_get_skins()
   while (($file = readdir($dir)) !== false)
   {
     $filename = $path.'/'.$file;
-    if (is_dir($filename) && is_readable($filename) 
-	&& !in_array($file, array('.', '..', '.svn')))
+    if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename))
       $skins[] = $file;
   }