remove logic from template and fix syntax error

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index de723e4cadda4d0ede8a861a19013254b41d54a9..253a7ff5f509cd2437aa999bf155cb21b7b3cee6 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -264,7 +264,7 @@ if (!$_['internetconnectionworking']) {
 
 <fieldset class="personalblock">
        <h2><?php p($l->t('Version'));?></h2>
-       <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); if(!empty(OC_Util::getBuild()) and OC_Util::getChannel()=='daily') { p(' Build:'); p(OC_Util::getBuild()); } ?>
+       <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
        <p>
                <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index a8f2fa8a5575d149533c120627544f5800d978af..2d8652aed7696e8d74d3eba1c0040af5c2b36422 100644 (file)
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -167,7 +167,7 @@ if($_['passwordChangeSupported']) {
 
 <fieldset class="personalblock">
        <h2><?php p($l->t('Version'));?></h2>
-       <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); if(!empty(OC_Util::getBuild()) and OC_Util::getChannel()=='daily') { p(' Build:'); p(OC_Util::getBuild()); } ?><br />
+       <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
 <?php if (OC_Util::getEditionString() === ''): ?>
        <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 <?php endif; ?>