From a74ece336d0370690ab2746c4ddb21a74e2cb535 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 12 Jun 2013 14:33:24 +0200 Subject: [PATCH] mage page title aware of ownCloud edition Conflicts: core/templates/layout.user.php --- core/templates/layout.base.php | 4 +++- core/templates/layout.guest.php | 4 +++- core/templates/layout.user.php | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 336df27ef1c..cebb9e561f1 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,7 +6,9 @@ - ownCloud + + <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index a3a8dc5f7ba..70c29580a9f 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,7 +6,9 @@ - ownCloud + + <?php OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition") ?> + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 6a8e221cbd3..6e9afecf9e8 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,8 +6,11 @@ - <?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud - <?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + + <?php p(!empty($_['application'])?$_['application'].' | ':''); + OC_Util::getEditionString() === '' ? p("ownCloud") : p("ownCloud Enterprise Edition"); + p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> + -- 2.39.5