diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-17 08:36:26 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-17 08:36:26 +0200 |
| commit | 229587a31ea6af65fd65e22f55635437eb44a7bc (patch) | |
| tree | 70b7678f5486f70b06354a11e4d51759aa16b507 /3rdparty | |
| parent | 7f1e0287a91dd39403d68426258c93b3c6992382 (diff) | |
| parent | ad4f066bac5e4d6777b258d6a161ab062211d787 (diff) | |
| download | nextcloud-server-229587a31ea6af65fd65e22f55635437eb44a7bc.tar.gz nextcloud-server-229587a31ea6af65fd65e22f55635437eb44a7bc.zip | |
Merge branch 'master' into calendar_repeat
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/smb4php/smb.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/3rdparty/smb4php/smb.php b/3rdparty/smb4php/smb.php index 69fb2487bc0..12c5890723b 100644 --- a/3rdparty/smb4php/smb.php +++ b/3rdparty/smb4php/smb.php @@ -326,8 +326,11 @@ class smb_stream_wrapper extends smb { $this->dir = array_keys($o['info']); $this->dir_index = 0; $this->adddircache ($url, $this->dir); + if(substr($url,-1,1)=='/'){ + $url=substr($url,0,-1); + } foreach ($o['info'] as $name => $info) { - smb::addstatcache($url . '/' . urlencode($name), $info); + smb::addstatcache($url . '/' . $name, $info); } } else { trigger_error ("dir_opendir(): dir failed for path '".$pu['path']."'", E_USER_WARNING); |