wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17501 from tbartenstein/patch-1

Browse source 
Update fileinfo.php
This commit is contained in:
Vincent Petry 2015-08-24 09:57:27 +02:00
commit 31d62c10bf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/tests/ajax_rename.php
View file

@ -116,7 +116,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase {
$this->assertEquals('abcdef', $result['data']['etag']);
$this->assertFalse(isset($result['data']['tags']));
$this->assertEquals('/', $result['data']['path']);
$icon = \OC_Helper::mimetypeIcon('dir');
$icon = \OC_Helper::mimetypeIcon('dir-external');
$icon = substr($icon, 0, -3) . 'svg';
$this->assertEquals($icon, $result['data']['icon']);
}

2
lib/private/files/fileinfo.php
View file

@ -252,7 +252,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
$sid = $this->getStorage()->getId();
if (!is_null($sid)) {
$sid = explode(':', $sid);
return ($sid[0] !== 'local' and $sid[0] !== 'home' and $sid[0] !== 'shared');
return ($sid[0] !== 'home' and $sid[0] !== 'shared');
}
return false;