diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-22 12:08:53 +0100 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-01-06 09:42:13 +0100 |
commit | 95d85ba8eb3ba65d457fbfe935fe60eda878f2e8 (patch) | |
tree | bc26c65fe170f610b6de200125543891d225ed12 /core | |
parent | 2816177ecb8349de87677a83d9dabbdc069fd346 (diff) | |
download | nextcloud-server-95d85ba8eb3ba65d457fbfe935fe60eda878f2e8.tar.gz nextcloud-server-95d85ba8eb3ba65d457fbfe935fe60eda878f2e8.zip |
Do not add ICssManager to OCP
We can add it later if needed
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'core')
-rw-r--r-- | core/Application.php | 4 | ||||
-rw-r--r-- | core/Controller/CssController.php | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/Application.php b/core/Application.php index 545b5fe420b..ec93c50b445 100644 --- a/core/Application.php +++ b/core/Application.php @@ -31,6 +31,7 @@ namespace OC\Core; use OC\AppFramework\Utility\SimpleContainer; +use OC\CssManager; use OC\Security\IdentityProof\Manager; use OCP\AppFramework\App; use OCP\Files\IAppData; @@ -57,5 +58,8 @@ class Application extends App { \OC::$server->getCrypto() ); }); + $container->registerService(CssManager::class, function () { + return new CssManager(\OC::$server->getAppDataDir('css')); + }); } } diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index a8d182418d4..eb5e8d55b26 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -22,17 +22,18 @@ namespace OC\Core\Controller; use OC\AppFramework\Utility\TimeFactory; +use OC\CssManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\FileDisplayResponse; -use OCP\ICssManager; +use OCP\Files\NotFoundException; use OCP\IRequest; class CssController extends Controller { - /** @var ICssManager */ + /** @var CssManager */ protected $cssManager; /** @var TimeFactory */ @@ -43,10 +44,10 @@ class CssController extends Controller { /** * @param string $appName * @param IRequest $request - * @param ICssManager $cssManager + * @param CssManager $cssManager * @param TimeFactory $timeFactory */ - public function __construct($appName, IRequest $request, ICssManager $cssManager, TimeFactory $timeFactory) { + public function __construct($appName, IRequest $request, CssManager $cssManager, TimeFactory $timeFactory) { parent::__construct($appName, $request); $this->cssManager = $cssManager; |