refactor: Fix rebasing issues

Signed-off-by: Carl Schwan <carlschwan@kde.org>
pull/58541/head
Carl Schwan 3 months ago
parent fe833c4dc1
commit b41709c8c8
No known key found for this signature in database
GPG Key ID: 02325448204E452A
  1. 1311
      lib/OC.php
  2. 6
      lib/base.php
  3. 1
      ocs/v1.php

File diff suppressed because it is too large Load Diff

@ -1,11 +1,9 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2013-2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
require_once __DIR__ . '/OC.php';

@ -28,7 +28,6 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
OC::init();
$request = Server::get(IRequest::class);
if ((Util::needUpgrade() || Server::get(IConfig::class)->getSystemValueBool('maintenance')) && $request->getPathInfo() !== '/core/update') {

Loading…
Cancel
Save