diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-04 20:13:00 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-04 20:13:00 -0500 |
| commit | a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a (patch) | |
| tree | f97d51339be2ffd6f5bdb309a461fdc82a2b0e6b | |
| parent | f2e6df807d05ef50b28ca2afc9ea51970ec0d87b (diff) | |
| download | nextcloud-server-a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a.tar.gz nextcloud-server-a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a.zip | |
Only show the version updating to instead of worrying about converting internal to a formatted version
| -rw-r--r-- | core/templates/update.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/templates/update.php b/core/templates/update.php index cf3f2ab0d79..41da712c6ca 100644 --- a/core/templates/update.php +++ b/core/templates/update.php @@ -1,6 +1,6 @@ <ul> <li class='update'> - <?php echo $l->t('Updating ownCloud from version %s to version %s, this may take a while.', array($_['installed'], $_['current'])); ?><br /><br /> + <?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br /> </li> </ul> <script> diff --git a/lib/base.php b/lib/base.php index e6355013c73..3d3e7d59f90 100644 --- a/lib/base.php +++ b/lib/base.php @@ -247,8 +247,7 @@ class OC OC_Config::setValue('maintenance', true); OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); $tmpl = new OC_Template('', 'update', 'guest'); - $tmpl->assign('current', $currentVersion); - $tmpl->assign('installed', $installedVersion); + $tmpl->assign('version', OC_Util::getVersionString()); $tmpl->printPage(); exit(); } else { |