Missing template added, fixed loadEmailTemplate() if templte was not found and debug...

diff --git a/.gitattributes b/.gitattributes
index 5a852719eba491790e7d7d941578941715e7d7db..c4b7a0969b1e1adfeed9ba7e613fc063936fdeda 100644 (file)
--- 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 c3943decf43ce2930a35ac84c2a4aefd47ff31ed..9f84147c1bbbfbbc0b5dab54e05ba4475bbb1e4f 100644 (file)
--- 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 (file)
index 0000000..2bc9ef3
--- /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