[Pkg-owncloud-commits] [owncloud] 88/239: remove logic from template and fix syntax error

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f6df4b349f6233b56c6f193d132ce04fb0dec47b
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sun Nov 24 21:27:32 2013 +0100

    remove logic from template and fix syntax error
---
 settings/templates/admin.php    | 2 +-
 settings/templates/personal.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index de723e4..253a7ff 100644
--- 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 a8f2fa8..2d8652a 100644
--- 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; ?>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git