diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-11 09:42:49 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-11 09:42:49 +0200 |
| commit | 99d03daf655cc1476cea9aee6254e5f0ad9c39a7 (patch) | |
| tree | b3941ac1ba7ec88dd4a0c54868b9f01bf41ff4cf | |
| parent | 532a919a0c5905b95949c653f8de406430a4ef0f (diff) | |
| parent | b0314907c0f54eba5d4d3dbb153855f3321f360a (diff) | |
| download | nextcloud-server-99d03daf655cc1476cea9aee6254e5f0ad9c39a7.tar.gz nextcloud-server-99d03daf655cc1476cea9aee6254e5f0ad9c39a7.zip | |
Merge pull request #16864 from owncloud/backport-concatenation-7
[stable7] Don't use command concatenation
| -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 |