Admin area 'Referral levels' refactured:

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

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 3e8da702f936ba04e5f8e5d034e9aa767d54e5e0..743e4a450b2096d1a2626491b2f12eb552b62ba9 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -524,19 +524,32 @@ function doExpressionFormClose ($data) {
 // Expression call-back to handle jquery inclusion
 function doExpressionJquery ($data) {
        // Default is compressed
-       $jquery = 'jquery.js';
+       $jquery = 'jquery';
+       $data['output_mode'] = '';
+
+       // Is there JS-mode?
+       if ($data['callback'] == 'js') {
+               // Switch to it
+               $data['output_mode'] = ',js';
+       } // END - if
+
+       // Is there a value?
+       if ($data['callback'] == 'js') {
+               // Then load special library
+               $jquery .= '-' . $data['value'];
+       } // END - if
 
        // Is debug mode enabled?
        if ((isGetRequestElementSet('jquery')) || (isSessionVariableSet('jquery'))) {
                // Then use uncompressed
-               $jquery = 'jquery-uncompressed.js';
+               $jquery .= '.uncompressed';
 
                // Remember it in session
                setSession('jquery', '1');
        } // END - if
 
        // Add {%url%} around it
-       $replacer = '{%url=js/' . $jquery . '?dummy=1%}';
+       $replacer = '{%url' . $data['output_mode'] . '=js/' . $jquery . '.js?dummy=1%}';
 
        // Replace the code
        $code = replaceExpressionCode($data, $replacer);