From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 5 Jan 2013 01:13:00 +0000 (-0500)
Subject: Only show the version updating to instead of worrying about converting internal to... 
X-Git-Tag: v5.0.0alpha1~258^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a94405b4e4ebbeea2f8bc3a220572dab1ae7cb3a;p=nextcloud-server.git

Only show the version updating to instead of worrying about converting internal to a formatted version
---

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 {