Skip to content

Commit 1ee9a07

Browse files
committed
fix: Change back base.php to have the same behavior as before
Isolated OC in its own file instead so that index.php can do finer init. Signed-off-by: Côme Chilliet <[email protected]>
1 parent 1d301dd commit 1ee9a07

File tree

10 files changed

+1306
-1302
lines changed

10 files changed

+1306
-1302
lines changed

console.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ function exceptionHandler($exception) {
3030
}
3131
try {
3232
require_once __DIR__ . '/lib/base.php';
33-
OC::init();
3433

3534
// set to run indefinitely if needed
3635
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {

core/ajax/update.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
}
3232

3333
require_once '../../lib/base.php';
34-
OC::init();
3534

3635
/** @var IL10N $l */
3736
$l = Server::get(IFactory::class)->get('core');

cron.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
try {
1818
require_once __DIR__ . '/lib/base.php';
1919

20-
OC::init();
21-
2220
if (isset($argv[1]) && ($argv[1] === '-h' || $argv[1] === '--help')) {
2321
echo 'Description:
2422
Run the background job routine

index.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
use OCP\Template\ITemplateManager;
2020
use Psr\Log\LoggerInterface;
2121

22-
require_once __DIR__ . '/lib/base.php';
22+
require_once __DIR__ . '/lib/OC.php';
23+
24+
\OC::boot();
2325

2426
$handler = static function () {
2527
try {

0 commit comments

Comments
 (0)