diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2016-07-18 15:59:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 15:59:47 +0200 |
| commit | ea470f877760c72b1e8b865ba600d5bd483027c0 (patch) | |
| tree | 3b4c4fa327d8e6521c782e6e45f1d73eb95d70ec /core | |
| parent | 68735c188c0f9777f932f55b1c290039c9d6e433 (diff) | |
| parent | ec6f6969789ca2f455c0d2fd04557337c782176b (diff) | |
| download | nextcloud-server-ea470f877760c72b1e8b865ba600d5bd483027c0.tar.gz nextcloud-server-ea470f877760c72b1e8b865ba600d5bd483027c0.zip | |
Merge pull request #405 from nextcloud/theming-fixes
Theming fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/Application.php | 6 | ||||
| -rw-r--r-- | core/Command/Maintenance/Install.php | 2 | ||||
| -rw-r--r-- | core/Controller/LostController.php | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/core/Application.php b/core/Application.php index a87917b626a..1485f7a7516 100644 --- a/core/Application.php +++ b/core/Application.php @@ -35,7 +35,7 @@ use OC\Core\Controller\LostController; use OC\Core\Controller\TokenController; use OC\Core\Controller\TwoFactorChallengeController; use OC\Core\Controller\UserController; -use OC_Defaults; +use OCP\Defaults; use OCP\AppFramework\App; use OCP\Util; @@ -165,8 +165,8 @@ class Application extends App { $container->registerService('UserFolder', function(SimpleContainer $c) { return $c->query('ServerContainer')->getUserFolder(); }); - $container->registerService('Defaults', function() { - return new OC_Defaults; + $container->registerService('Defaults', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getThemingDefaults(); }); $container->registerService('Mailer', function(SimpleContainer $c) { return $c->query('ServerContainer')->getMailer(); diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index cee0c60b488..3e9e043b036 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -64,7 +64,7 @@ class Install extends Command { // validate the environment $server = \OC::$server; $setupHelper = new Setup($this->config, $server->getIniWrapper(), - $server->getL10N('lib'), new \OC_Defaults(), $server->getLogger(), + $server->getL10N('lib'), $server->getThemingDefaults(), $server->getLogger(), $server->getSecureRandom()); $sysInfo = $setupHelper->getSystemInfo(true); $errors = $sysInfo['errors']; diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php index b509d4bf632..774404af0a5 100644 --- a/core/Controller/LostController.php +++ b/core/Controller/LostController.php @@ -38,7 +38,6 @@ use \OCP\IConfig; use OCP\IUserManager; use OCP\Mail\IMailer; use OCP\Security\ISecureRandom; -use \OC_Defaults; use OCP\Security\StringUtils; /** @@ -54,8 +53,7 @@ class LostController extends Controller { protected $urlGenerator; /** @var IUserManager */ protected $userManager; - // FIXME: Inject a non-static factory of OC_Defaults for better unit-testing - /** @var OC_Defaults */ + /** @var \OC_Defaults */ protected $defaults; /** @var IL10N */ protected $l10n; @@ -77,7 +75,7 @@ class LostController extends Controller { * @param IRequest $request * @param IURLGenerator $urlGenerator * @param IUserManager $userManager - * @param OC_Defaults $defaults + * @param \OC_Defaults $defaults * @param IL10N $l10n * @param IConfig $config * @param ISecureRandom $secureRandom @@ -90,7 +88,7 @@ class LostController extends Controller { IRequest $request, IURLGenerator $urlGenerator, IUserManager $userManager, - OC_Defaults $defaults, + \OC_Defaults $defaults, IL10N $l10n, IConfig $config, ISecureRandom $secureRandom, |