From 3c691c9ec9b659897f4dda3769da7049c1ed23a9 Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 3 Jul 2013 14:21:51 +0200 Subject: move to non-static OC_Defaults Conflicts: lib/mail.php --- core/templates/layout.base.php | 4 ++-- core/templates/layout.guest.php | 8 ++++---- core/templates/layout.user.php | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/templates') diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 51bac790741..09e1006d507 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,11 @@ - + - <?php p(OC_Defaults::getName()); ?> + <?php p($defaults->getName()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index b17e2fc547c..329744e3824 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,11 @@ - + - <?php p(OC_Defaults::getName()); ?> + <?php p($defaults->getName()); ?> @@ -38,13 +38,13 @@
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2dd339cef96..dacbe79bd34 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,12 @@ - + <?php p(!empty($_['application'])?$_['application'].' | ':''); - p(OC_Defaults::getName()); + p($defaults->getName()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> @@ -46,7 +46,7 @@