diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-06-05 10:28:30 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-06-05 10:28:30 +0200 |
| commit | 71b86136c2de2506c397f39ddaae3552d4061cdd (patch) | |
| tree | 50e778b12c2bfed5f6ca026900f41b4cab3564f3 /core | |
| parent | ff3ded6cb2f8542c3b2a083f4dabc83ccfa1888e (diff) | |
| parent | 95fda3c17c6d03bead4b6a754f1e9a71d3cc7e50 (diff) | |
| download | nextcloud-server-71b86136c2de2506c397f39ddaae3552d4061cdd.tar.gz nextcloud-server-71b86136c2de2506c397f39ddaae3552d4061cdd.zip | |
Merge pull request #8878 from owncloud/update-checkmigrationforapps
Simulate apps database schema update on upgrade
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/update.php | 3 | ||||
| -rw-r--r-- | core/command/upgrade.php | 3 | ||||
| -rw-r--r-- | core/js/update.js | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 84d7a21209e..698614c975f 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -15,6 +15,9 @@ if (OC::checkUpgrade(false)) { $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) { $eventSource->send('success', (string)$l->t('Updated database')); }); + $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) { + $eventSource->send('success', (string)$l->t('Checked database schema update')); + }); $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) { $list = array(); foreach ($appList as $appId) { diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 8ce8ef9b6e5..c3946d2aab5 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -56,6 +56,9 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) { $output->writeln('<info>Updated database</info>'); }); + $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) { + $output->writeln('<info>Checked database schema update</info>'); + }); $updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) { $output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>'); }); diff --git a/core/js/update.js b/core/js/update.js index cc0f541bd79..e5ce322df95 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -28,7 +28,7 @@ this.addMessage(t( 'core', 'Updating {productName} to version {version}, this may take a while.', { - productName: OC.theme.name, + productName: OC.theme.name || 'ownCloud', version: OC.config.versionstring }), 'bold' |