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

Merge pull request #24132 from owncloud/fix-web-updater 

Fix web updater
This commit is contained in:
Thomas Müller 2016-04-20 21:50:00 +02:00
parent 6b66f2dfb4 22db0f17a8
commit 7e2a1656f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ajax/update.php
View File

@ -37,13 +37,13 @@ $eventSource = \OC::$server->createEventSource();
// need to send an initial message to force-init the event source,
// which will then trigger its own CSRF check and produces its own CSRF error
// message
//$eventSource->send('success', (string)$l->t('Preparing update'));
$eventSource->send('success', (string)$l->t('Preparing update'));
if (OC::checkUpgrade(false)) {
$config = \OC::$server->getSystemConfig();
if ($config->getValue('upgrade.disable-web', true)) {
$eventSource->send('failure', (string)$l->t('Updates need to be installed. Please use the command line updater.'));
if ($config->getValue('upgrade.disable-web', false)) {
$eventSource->send('failure', (string)$l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
$eventSource->close();
exit();
}