diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-10-24 21:55:25 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-10-24 21:55:25 +0200 |
| commit | 675a56c5ed798afae6bc9e56616f948a2c4496c2 (patch) | |
| tree | 53f8b9688d4ace289d8b5438e22fa3d857e3aa5b /lib/filestorage/local.php | |
| parent | befdd6b63b1f64625bd26d50b18ebef5b8f82db4 (diff) | |
| parent | 515e1b467e58337067ee3a4a8945f449d3c2ef3a (diff) | |
| download | nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.tar.gz nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/filestorage/local.php')
| -rw-r--r-- | lib/filestorage/local.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 80aa548047c..731ac4a3c72 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -103,7 +103,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ if(!$this->file_exists($path2)) { $this->mkdir($path2); } - $source=substr($path1,strrpos($path1,'/')+1); + $source=substr($path1, strrpos($path1,'/')+1); $path2.=$source; } return copy($this->datadir.$path1,$this->datadir.$path2); @@ -178,7 +178,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $files=array(); foreach (scandir($this->datadir.$dir) as $item) { if ($item == '.' || $item == '..') continue; - if(strstr(strtolower($item),strtolower($query))!==false) { + if(strstr(strtolower($item), strtolower($query))!==false) { $files[]=$dir.'/'.$item; } if(is_dir($this->datadir.$dir.'/'.$item)) { |