From 7cf81f2d127aa6ea119c4f79db211bcae746735d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 13 Oct 2013 21:51:47 +0200
Subject: [PATCH] show the channel. Also mark git as git channel so that
someone can see where this build comes from
---
settings/templates/admin.php | 2 +-
settings/templates/personal.php | 2 +-
version.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d51a22b72a4..1091b1dab54 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -248,7 +248,7 @@ endfor;?>
<fieldset class="personalblock">
<h2><?php p($l->t('Version'));?></h2>
- <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
+ <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?>
<?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 1be7be578d3..60c509b4a1c 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()); ?><br/>
+ <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString().' ('.OC_Util::getChannel().')'); ?><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; ?>
diff --git a/version.php b/version.php
index b3e34b5df4b..8386ee6f875 100644
--- a/version.php
+++ b/version.php
@@ -10,7 +10,7 @@ $OC_VersionString='6.0 alpha 1';
$OC_Edition='';
// The ownCloud channel
-$OC_Channel='';
+$OC_Channel='git';
// The build number
$OC_Build='';
--
GitLab