diff options
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 4 | ||||
| -rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 2 | ||||
| -rw-r--r-- | lib/private/Server.php | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 0314b06b849..9139dd56247 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -23,14 +23,11 @@ namespace OCA\Theming; - - use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; use OCP\Files\IRootFolder; - class ThemingDefaults extends \OC_Defaults { /** @var IConfig */ @@ -57,6 +54,7 @@ class ThemingDefaults extends \OC_Defaults { * @param IL10N $l * @param IURLGenerator $urlGenerator * @param \OC_Defaults $defaults + * @param IRootFolder $rootFolder */ public function __construct(IConfig $config, IL10N $l, diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 0aa88c3115e..ffa6810ffde 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -78,8 +78,6 @@ class ThemingDefaultsTest extends TestCase { $this->defaults, $this->rootFolder ); - - //return parent::setUp(); } public function testGetNameWithDefault() { diff --git a/lib/private/Server.php b/lib/private/Server.php index 02419e9a5e7..e99c6e8c56a 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -656,7 +656,7 @@ class Server extends ServerContainer implements IServerContainer { $c->getL10N('theming'), $c->getURLGenerator(), new \OC_Defaults(), - $c->getRootFolder() + $c->getLazyRootFolder() ); } return new \OC_Defaults(); |