Rewrote some parts:

[mailer.git] / inc / expression-functions.php

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index abce20ffbe04cefa564f8afb3a241976271e79c9..e25a28fd3f204ce60b1fce41b7e0d50eb7ec8f73 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -157,7 +157,7 @@ function doExpressionExt ($data) {
        } // END - if
 
        // Generate replacer
-       $replacer = sprintf("&ext=%s&ver=%s&rev={?CURRENT_REPOSITORY_REVISION?}", $data['matches'][4][$data['key']], $replacer);
+       $replacer = sprintf('&ext=%s&ver=%s&rev={?CURRENT_REPOSITORY_REVISION?}', $data['matches'][4][$data['key']], $replacer);
 
        // Replace it and insert parameter for GET request
        $code = replaceExpressionCode($data, $replacer);
@@ -444,7 +444,7 @@ function doExpressionForm ($data) {
                if ($value == 'formmethodpost') {
                        // Use it
                        $data['__form_method'] = 'post';
-               } elseif (($value == 'formmethodpost') && (!isSpider()) && (!isSessionValid())) {
+               } elseif (($value == 'formmethodpost') && (!isSpider()) && (!isValidSession())) {
                        // Then expand 'value' with session id
                        if (strpos($data['value'], '?') !== FALSE) {
                                // '?' is set