From c48e00294c9d331f55b91c55f56daac706ecdf6b Mon Sep 17 00:00:00 2001 From: tbartenstein Date: Wed, 8 Jul 2015 18:48:11 +0200 Subject: [PATCH 1/2] Update fileinfo.php Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712) --- lib/private/files/fileinfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 5e1c2aecc787c6504704deb85ca2ad493a1ad5d1 Mon Sep 17 00:00:00 2001 From: tbartenstein Date: Fri, 21 Aug 2015 18:54:09 +0200 Subject: [PATCH 2/2] fix unit test for folder renaming (icon) fix unit test to go with #17501 and check for the new icon --- apps/files/tests/ajax_rename.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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']); }