[Pkg-owncloud-commits] [owncloud] 148/258: for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar

[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 257dbe61e25fd5f6c6546ce5f0a4560ef805bb3c
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date:   Fri Sep 26 15:38:35 2014 +0200

    for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
---
 core/templates/layout.user.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3fa922f..91affc9 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,7 +49,13 @@
 			</a>
 			<a href="#" class="menutoggle">
 				<div class="header-appname">
-					<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+					<?php
+						if(OC_Util::getEditionString() === '') {
+							p(!empty($_['application'])?$_['application']: $l->t('Apps'));
+						} else {
+							p($theme->getName());
+						}
+					?>
 				</div>
 				<div class="icon-caret svg"></div>
 			</a>

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