Continued:

- this function was started some time ago and should (seems so?) handle
  JavaScript (file?) callbacks

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index afb7a7bf530da5f7a79bf42014c356ea5c30ed98..65a8acdbd61f17fe49aee8d6d6c0bc64a5e367ce 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -552,5 +552,5 @@ function doExpressionJquery ($data) {
 
 // Expression call-back to handle JavaScript inclusion
 function doExpressionJs ($data) {
 
 // Expression call-back to handle JavaScript inclusion
 function doExpressionJs ($data) {

-       die('<pre>'.print_r($data, TRUE));
+       /* DEBUG-DIE: */ die(sprintf('[%s:%d]: data=<pre>%s</pre>', __FUNCTION__, __LINE__, print_r($data, TRUE)));

 }
 }

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 25b337d46c6e5f3761bbab1be7932ac9b06a7173..175244f770b15f795211cc12d865ed53fc8a5f31 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -236,7 +236,7 @@ function getActualTheme () {
                // Set default theme
                setMailerTheme($ret);
        } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
                // Set default theme
                setMailerTheme($ret);
        } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {

-               //die("<pre>".print_r($GLOBALS['cache_array']['themes'], TRUE)."</pre>");
+               //* DEBUG-DIE: */ die("<pre>".print_r($GLOBALS['cache_array']['themes'], TRUE)."</pre>");

                // Get theme from cookie
                $ret = getSession('mailer_theme');
 
                // Get theme from cookie
                $ret = getSession('mailer_theme');