mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix theming defaults injection if theming app is disabled 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2019-01-31 09:53:45 +01:00
parent 16fec60e8f
commit 9d285c4459
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
View File

@ -23,14 +23,12 @@
namespace OCA\DAV\Provisioning\Apple; namespace OCA\DAV\Provisioning\Apple;
use OCA\Theming\ThemingDefaults;
use OCP\IL10N; use OCP\IL10N;
use OCP\IRequest; use OCP\IRequest;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\IUserSession; use OCP\IUserSession;
use Sabre\DAV\Server; use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin; use Sabre\DAV\ServerPlugin;
use Sabre\DAV\UUIDUtil;
use Sabre\HTTP\RequestInterface; use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface; use Sabre\HTTP\ResponseInterface;
@ -52,7 +50,7 @@ class AppleProvisioningPlugin extends ServerPlugin {
protected $userSession; protected $userSession;
/** /**
* @var ThemingDefaults * @var \OC_Defaults
*/ */
protected $themingDefaults; protected $themingDefaults;
@ -76,13 +74,13 @@ class AppleProvisioningPlugin extends ServerPlugin {
* *
* @param IUserSession $userSession * @param IUserSession $userSession
* @param IURLGenerator $urlGenerator * @param IURLGenerator $urlGenerator
* @param ThemingDefaults $themingDefaults * @param \OC_Defaults $themingDefaults
* @param IRequest $request * @param IRequest $request
* @param IL10N $l10n * @param IL10N $l10n
* @param \closure $uuidClosure * @param \closure $uuidClosure
*/ */
public function __construct(IUserSession $userSession, IURLGenerator $urlGenerator, public function __construct(IUserSession $userSession, IURLGenerator $urlGenerator,
ThemingDefaults $themingDefaults, IRequest $request, \OC_Defaults $themingDefaults, IRequest $request,
IL10N $l10n, \closure $uuidClosure) { IL10N $l10n, \closure $uuidClosure) {
$this->userSession = $userSession; $this->userSession = $userSession;
$this->urlGenerator = $urlGenerator; $this->urlGenerator = $urlGenerator;