From 84253fdf19237eee73da691915c617834f0dd734 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 21 Oct 2012 18:58:41 +0000 Subject: [PATCH] Missing template added, fixed loadEmailTemplate() if templte was not found and debug-mode was enabled --- .gitattributes | 1 + inc/template-functions.php | 2 +- .../emails/admin/admin_edit_surfbar_actions.tpl | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 templates/de/emails/admin/admin_edit_surfbar_actions.tpl diff --git a/.gitattributes b/.gitattributes index 5a852719eb..c4b7a0969b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -917,6 +917,7 @@ templates/de/emails/admin/admin_edit_forced_ads.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain +templates/de/emails/admin/admin_edit_surfbar_actions.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_extension_deactivated.tpl svneol=native#text/plain diff --git a/inc/template-functions.php b/inc/template-functions.php index c3943decf4..9f84147c1b 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -536,7 +536,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load // Are there some content? if (empty($newContent)) { // Compiling failed - $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['template_content']['email'][$template]; + $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['template_eval']['email'][$template]; // Add last error if the required function exists if (function_exists('error_get_last')) { diff --git a/templates/de/emails/admin/admin_edit_surfbar_actions.tpl b/templates/de/emails/admin/admin_edit_surfbar_actions.tpl new file mode 100644 index 0000000000..2bc9ef3ce9 --- /dev/null +++ b/templates/de/emails/admin/admin_edit_surfbar_actions.tpl @@ -0,0 +1,17 @@ +Hallo Administrator, + +es wurden Mitgliederaktionen angepasst. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ADMIN_SURFBAR_CURRENT_STATUS--}: {%pipe,translateSurfbarUrlStatus=$content[actions_status]%} +------------------------------------------ +{--ADMIN_SURFBAR_MEMBER_ACTION--}: {%pipe,translateMemberSurfbarActionToSubmit=$content[actions_action]%} +------------------------------------------ +{--ADMIN_SURFBAR_NEW_STATUS--}: {%pipe,translateSurfbarUrlStatus=$content[actions_new_status]%} +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php -- 2.39.2