More fixes for cache, extension and filter sub-system

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 4b87bcf918336e2c5b931795f3ab96606f0b42b0..99308e65a5ece761d27e3aab0d4dac78f7771aa1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -774,7 +774,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        // Is the admin logged in?
        if (IS_ADMIN()) {
                // Get admin id
-               $aid = GET_ADMIN_ID(get_session('admin_login'));
+               $aid = GET_CURRENT_ADMIN_ID();
 
                // Load Admin data
                $ADMIN = GET_ADMIN_EMAIL($aid);
@@ -2640,6 +2640,7 @@ function REBUILD_CACHE ($cache, $inc="") {
                        // Is the include there?
                        if (FILE_READABLE($fqfn)) {
                                // And rebuild it from scratch
+                               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): inc={$inc} - LOADED!<br />\n";
                                require($fqfn);
                        } else {
                                // Include not found!