diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-11-17 19:33:23 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-11-17 19:33:23 +0000 |
| commit | 6827944ee157014befe64e6ca6f9342c79871eb9 (patch) | |
| tree | 8bf25ad8ffa3d273d76590fd337c3427e6b7daa7 | |
| parent | c2746453ea943b8354f036ea525535029fa0b7e2 (diff) | |
- Fix displaying of hidden directories in skins list (#1486301)
- Fix open_basedir restriction error when reading skins list (#1486304)
git-svn-id: https://svn.roundcube.net/trunk@3114 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 8d43e6aca..2bfc11f30 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index fc1755665..a2175b0f0 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/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; } |