diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-10 05:42:08 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-10 05:42:08 +0100 |
| commit | 7028c7150dd3181c3416ad77ca675e85514cdae3 (patch) | |
| tree | 3466360277aebfd91cbd6b26b3c54ebbc6c0ea58 /core | |
| parent | 263e008d7b0df17071a9d8ef915586d0cb5abab3 (diff) | |
| parent | adab0ca98a9ab8f3d4f27909c6d46bb170595d20 (diff) | |
| download | nextcloud-server-7028c7150dd3181c3416ad77ca675e85514cdae3.tar.gz nextcloud-server-7028c7150dd3181c3416ad77ca675e85514cdae3.zip | |
Merge pull request #12664 from owncloud/fix-12164
Use httphelper and cache response even when it is empty
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/update.php | 6 | ||||
| -rw-r--r-- | core/command/upgrade.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 419992c9891..5a9288a6381 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -9,7 +9,11 @@ if (OC::checkUpgrade(false)) { $l = new \OC_L10N('core'); $eventSource = \OC::$server->createEventSource(); - $updater = new \OC\Updater(\OC_Log::$object); + $updater = new \OC\Updater( + \OC::$server->getHTTPHelper(), + \OC::$server->getAppConfig(), + \OC_Log::$object + ); $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Turned on maintenance mode')); }); diff --git a/core/command/upgrade.php b/core/command/upgrade.php index aaeb63a3124..6e5ac1c5c9a 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -84,7 +84,7 @@ class Upgrade extends Command { if(\OC::checkUpgrade(false)) { $self = $this; - $updater = new Updater(); + $updater = new Updater(\OC::$server->getHTTPHelper(), \OC::$server->getAppConfig()); $updater->setSimulateStepEnabled($simulateStepEnabled); $updater->setUpdateStepEnabled($updateStepEnabled); |