diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-11 10:42:27 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-11 10:42:27 +0300 |
| commit | 64d502d602d9649a2c05c0c283fb31592fc1505e (patch) | |
| tree | 22e4837ff23e11a56d10677a5573b37eaef5cb4b /apps | |
| parent | 75c7554f62304e63b8eb8c02a3412e4a6f46d662 (diff) | |
| parent | 14c760124fd0eb92684297c587769cea1d11f2f2 (diff) | |
Merge pull request #16862 from owncloud/use-single-action
[stable8] Don't use command concatenation
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/3rdparty/smb4php/smb.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php index 7ffdb42e134..5db663b0bde 100644 --- a/apps/files_external/3rdparty/smb4php/smb.php +++ b/apps/files_external/3rdparty/smb4php/smb.php @@ -324,14 +324,14 @@ class smb { trigger_error('rename(): error in URL', E_USER_ERROR); } smb::clearstatcache ($url_from); - $cmd = ''; // check if target file exists if (smb::url_stat($url_to)) { // delete target file first - $cmd = 'del "' . $to['path'] . '"; '; + $cmd = 'del "' . $to['path'] . '"'; + smb::execute($cmd, $to); $replace = true; } - $cmd .= 'rename "' . $from['path'] . '" "' . $to['path'] . '"'; + $cmd = 'rename "' . $from['path'] . '" "' . $to['path'] . '"'; $result = smb::execute($cmd, $to); if ($replace) { // clear again, else the cache will return the info |