diff options
| author | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
| commit | fe9851b94f1bfe4014cf48043b4609def611a3ee (patch) | |
| tree | 2362c48e0526f2254bb80a70db107b3032736a80 /lib/plugins/config/settings | |
| parent | 1614eb9180008daaf518e6271b82222219efc008 (diff) | |
| parent | 2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff) | |
| download | rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.gz rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.bz2 | |
Merge remote branch 'upstream/master'
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); } |