From 75fd6d4fde4cd6d9eda5e6b944739f1f2798447d Mon Sep 17 00:00:00 2001 From: Björn Schießle Date: Wed, 24 Jul 2013 11:51:21 +0200 Subject: initialize OC_Defaults in template constructorX --- core/templates/altmail.php | 6 ++---- core/templates/layout.base.php | 4 +--- core/templates/layout.guest.php | 10 ++++------ core/templates/layout.user.php | 8 +++----- core/templates/mail.php | 9 ++++----- 5 files changed, 14 insertions(+), 23 deletions(-) (limited to 'core/templates') diff --git a/core/templates/altmail.php b/core/templates/altmail.php index a7df29a2446..2551473c6f0 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,7 @@ t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); ?> -- -getName() . ' - ' . $defaults->getSlogan()); ?> -getBaseUrl()); +getName() . ' - ' . $theme->getSlogan()); ?> +getBaseUrl()); diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 2399512eacd..ea10c3042b5 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -6,11 +6,9 @@ - - - <?php p($defaults->getTitle()); ?> + <?php p($theme->getTitle()); ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e20d28970a5..9f645b6500d 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -6,11 +6,9 @@ - - - <?php p($defaults->getTitle()); ?> + <?php p($theme->getTitle()); ?> @@ -37,14 +35,14 @@
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 87c02a83d3b..b7405ea273b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -6,12 +6,10 @@ - - <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($defaults->getTitle()); + p($theme->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> @@ -45,8 +43,8 @@