Further fixes for wrong getMaskedMessage() usage in 'compiled' code

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index c114e317731b521ac5c6ceb5e6f9294273e775a2..e112a20bf393504162f381418a00d1c4e837c668 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -221,7 +221,7 @@ function doExpressionValidatorLinks ($data) {
 // Expression call-back for dynamic messages
 function doExpressionMessage ($data) {
        // Message string replacement depends on if message is masked
-       if (isMessageMasked($data['callback'])) {
+       if ((isMessageMasked($data['callback'])) && ((!empty($data['extra_func'])) || ($data['extra_func'] == '0'))) {
                // Message should be masked
                $replacer = "{DQUOTE} . getMaskedMessage('" . $data['callback'] . "', '" . $data['extra_func'] . "') . {DQUOTE}";
        } else {

diff --git a/inc/functions.php b/inc/functions.php
index 7fb03af44853657e86a18351143f696e7f511a41..5e7d2962d2adabc3e0a022d89c4b4fe8ff30dfc3 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -171,7 +171,7 @@ function compileFinalOutput () {
 
 // Main compilation loop
 function doFinalCompilation ($code, $insertComments = true) {
-       // Insert comments?
+       // Insert comments? (Only valid with HTML templates, of course)
        enableTemplateHtml($insertComments);
 
        // Init counter
@@ -186,7 +186,7 @@ function doFinalCompilation ($code, $insertComments = true) {
                // Compile it
                //* DEBUG: */ print '<pre>'.htmlentities($code).'</pre>';
                $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
-               //* DEBUG: */ die('<pre>'.htmlentities($eval).'</pre>');
+               //* DEBUG: */ if ($insertComments) die('<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
                //* DEBUG: */ die('<pre>'.htmlentities($newContent).'</pre>');
 

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 590e4b9793d9be0350038d72552aeec5a042cdb4..65855155377b0d8998ea675a9359d3d815c7e20f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -147,12 +147,14 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
        $content['city']      = SQL_ESCAPE(postRequestParameter('city'));
        $content['email']     = SQL_ESCAPE(postRequestParameter('email'));
 
-       // Prepare country selection box
-       $OUT  = "<select name=\"country_code\" class=\"guest_select\" size=\"1\">\n";
+       // The admin may see all
        $whereStatement = "WHERE `is_active`='Y'";
        if (isAdmin()) $whereStatement = '';
+
+       // Prepare country selection box
+       $OUT  = '<select name="country_code" class="guest_select" size="1">';
        $OUT .= generateOptionList('countries', 'id', 'descr', postRequestParameter('country_code'), 'code', $whereStatement);
-       $OUT .= "</select>";
+       $OUT .= '</select>';
        $content['country'] = $OUT;
 
        // Set must-fillout fields