diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-12-16 16:11:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 16:11:39 +0100 |
| commit | 00b4dedef5eb36584fd7c07da770d8bd3b4d9c63 (patch) | |
| tree | 675c87086acff88327823691ea9b1b21c1379d03 /apps/files_external | |
| parent | 058b536aea6f27dd4c8d8eb2581552e9287a8a38 (diff) | |
| parent | b5401adc00790c33b2618f9f544c20ab747b9f7e (diff) | |
| download | nextcloud-server-00b4dedef5eb36584fd7c07da770d8bd3b4d9c63.tar.gz nextcloud-server-00b4dedef5eb36584fd7c07da770d8bd3b4d9c63.zip | |
Merge pull request #2550 from nextcloud/smb-notify-rename
Fix order of parameters when getting notified of smb renames
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index e98cbefaec3..4773afcb75f 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -499,9 +499,11 @@ class SMB extends Common implements INotifyStorage { if (is_null($type)) { return true; } - if ($type === INotifyStorage::NOTIFY_RENAMED && !is_null($oldRenamePath)) { - $result = $callback($type, $path, $oldRenamePath); - $oldRenamePath = null; + if ($type === INotifyStorage::NOTIFY_RENAMED) { + if (!is_null($oldRenamePath)) { + $result = $callback($type, $oldRenamePath, $path); + $oldRenamePath = null; + } } else { $result = $callback($type, $path); } |