mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-28 01:29:05 +01:00
"dont return mountpoints (like eg. /apps) twice"
This commit is contained in:
parent
5cfc38b4f6
commit
48352f6963
@ -647,8 +647,9 @@ class vfs_stream_wrapper implements iface_stream_wrapper
|
|||||||
do {
|
do {
|
||||||
$file = readdir($this->opened_dir);
|
$file = readdir($this->opened_dir);
|
||||||
}
|
}
|
||||||
while($file !== false && self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
|
while($file !== false && (is_array($this->extra_dirs) && in_array($file,$this->extra_dirs) || // dont return mountpoints twice
|
||||||
!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_vfs::READABLE));
|
self::HIDE_UNREADABLES && !$this->opened_dir_writable &&
|
||||||
|
!egw_vfs::check_access(egw_vfs::concat($this->opened_dir_url,$file),egw_vfs::READABLE)));
|
||||||
|
|
||||||
return $file;
|
return $file;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user