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

This commit is contained in:
Michael Gapczynski 2013-01-04 20:13:00 -05:00
parent f2e6df807d
commit a94405b4e4
2 changed files with 2 additions and 3 deletions

View File

@ -1,6 +1,6 @@
<ul> <ul>
<li class='update'> <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> </li>
</ul> </ul>
<script> <script>

View File

@ -247,8 +247,7 @@ class OC
OC_Config::setValue('maintenance', true); OC_Config::setValue('maintenance', true);
OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG);
$tmpl = new OC_Template('', 'update', 'guest'); $tmpl = new OC_Template('', 'update', 'guest');
$tmpl->assign('current', $currentVersion); $tmpl->assign('version', OC_Util::getVersionString());
$tmpl->assign('installed', $installedVersion);
$tmpl->printPage(); $tmpl->printPage();
exit(); exit();
} else { } else {