diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-12-13 09:13:06 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-12-13 09:13:06 -0800 |
| commit | 769256cb39b0c28d1c0354fc57183491c6ace189 (patch) | |
| tree | 909b4c84787a9f1c4e2002d31a3df28b69280973 | |
| parent | a84fe4790f2177b09f3af737e8eb04e3ac5bc84b (diff) | |
| parent | a8f814fe2d979ef8375f9dd7dff68f31f816cb44 (diff) | |
| download | nextcloud-server-769256cb39b0c28d1c0354fc57183491c6ace189.tar.gz nextcloud-server-769256cb39b0c28d1c0354fc57183491c6ace189.zip | |
Merge pull request #6321 from sevoku/master
fix smbclient directory listing parser
| -rw-r--r-- | apps/files_external/3rdparty/smb4php/smb.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php index 87638271f0e..f9ee51f8306 100644 --- a/apps/files_external/3rdparty/smb4php/smb.php +++ b/apps/files_external/3rdparty/smb4php/smb.php @@ -160,7 +160,7 @@ class smb { $i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master); break; case 'files': - list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R]+)$/", trim ($regs[1]), $regs2) + list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|N|S|R]+)$/", trim ($regs[1]), $regs2) ? array (trim ($regs2[2]), trim ($regs2[1])) : array ('', trim ($regs[1])); list ($his, $im) = array ( |