diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-08-24 09:57:27 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-08-24 09:57:27 +0200 |
| commit | 31d62c10bfa014ec295654da0dd77963a6d670dc (patch) | |
| tree | 55975f46a4b10592ed9bd00fcf3e840ece1a2af5 | |
| parent | 40b1054530229139a5cacf28ed4b883d52835ad6 (diff) | |
| parent | 5e1c2aecc787c6504704deb85ca2ad493a1ad5d1 (diff) | |
| download | nextcloud-server-31d62c10bfa014ec295654da0dd77963a6d670dc.tar.gz nextcloud-server-31d62c10bfa014ec295654da0dd77963a6d670dc.zip | |
Merge pull request #17501 from tbartenstein/patch-1
Update fileinfo.php
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 2 | ||||
| -rw-r--r-- | lib/private/files/fileinfo.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index a690c7dcb0c..8abde9094d9 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -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']); } diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index 82c8f3de690..b333844f8c8 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -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; |