diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
| commit | 560f6ea3cdac2767863c3be3a9e7933b6e37e88f (patch) | |
| tree | 6f51d4b3402458e4de1a596b93ec752c8ac747b2 /lib/plugins/config/settings | |
| parent | e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a (diff) | |
| parent | c66c7229a0dfc4f9f06dadda98408679fa7a18d6 (diff) | |
| download | rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.gz rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.bz2 | |
Merge branch 'master' into bcrypt
Diffstat (limited to 'lib/plugins/config/settings')
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 54fe2ad9c..adf7d217a 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -774,8 +774,8 @@ if (!class_exists('setting_dirchoice')) { if ($entry == '.' || $entry == '..') continue; if ($this->_pattern && !preg_match($this->_pattern,$entry)) continue; - $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $entry; - if (is_dir($this->_dir.$file)) $list[] = $entry; + $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $this->_dir.$entry; + if (is_dir($file)) $list[] = $entry; } closedir($dh); } |