Only show the version updating to instead of worrying about converting internal to...

diff --git a/core/templates/update.php b/core/templates/update.php
index cf3f2ab0d790083419e8a7d2dcf7c37ec3b4a586..41da712c6caf4b135b59cfa17434c86db1e70d58 100644 (file)
--- 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 e6355013c737c344db41ea9cb0b642b2772c91c3..3d3e7d59f909f9affcf93bf868d6215c1ade18e1 100644 (file)
--- 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 {