diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-25 18:26:08 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-25 18:26:08 +0200 |
| commit | 7bc49d2a57ab337f7a74d55e748e69284e3be430 (patch) | |
| tree | fc54618043ae5e0e4f36e0a23d171dfa18a0947c /lib/files/storage | |
| parent | 5a3d6805a2613c4f55daa971e112cc77f17b060f (diff) | |
| parent | ec613b589bed2069346696902f59eadc2a3a91d5 (diff) | |
| download | nextcloud-server-7bc49d2a57ab337f7a74d55e748e69284e3be430.tar.gz nextcloud-server-7bc49d2a57ab337f7a74d55e748e69284e3be430.zip | |
merge master into filesystem
Diffstat (limited to 'lib/files/storage')
| -rw-r--r-- | lib/files/storage/common.php | 2 | ||||
| -rw-r--r-- | lib/files/storage/local.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 1694563d49e..e22264d0da9 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -230,7 +230,7 @@ abstract class Common implements \OC\Files\Storage\Storage { if($dh) { while($item=readdir($dh)) { if ($item == '.' || $item == '..') continue; - if(strstr(strtolower($item),strtolower($query))!==false) { + if(strstr(strtolower($item), strtolower($query))!==false) { $files[]=$dir.'/'.$item; } if($this->is_dir($dir.'/'.$item)) { diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index ccd69e3971c..71f3bedad39 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -112,7 +112,7 @@ class Local extends \OC\Files\Storage\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); @@ -187,7 +187,7 @@ class Local extends \OC\Files\Storage\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)) { |