Fix of display-bug in member's overview of points (what=points) and extra call-back...

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 4af907683861922bae98937ef641e7abc8af7e36..5e2bb0a9ca7ab1df8753a8fe87e1c836a13e37ce 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -98,9 +98,9 @@ function doExpressionUser ($data) {
        }
 
        // Do we have another function to run (e.g. translations)
        }
 
        // Do we have another function to run (e.g. translations)

-       if (!empty($extraFunction)) {
+       if (!empty($data['extra_func'])) {

                // Surround the original function call with it
                // Surround the original function call with it

-               $functionName = $extraFunction . '(' . $functionName . ')';
+               $functionName = $data['extra_func'] . '(' . $functionName . ')';

        } // END - if
 
        // Now replace the code
        } // END - if
 
        // Now replace the code

diff --git a/inc/filters.php b/inc/filters.php
index 9345e507e282ea4e641be0549a26c8a6bee76cad..627a4007b89bc12e39c14db67edfe2de6421aae4 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -475,11 +475,12 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                        if (function_exists($commandFunction)) {
                                // Prepare $matches, $key, $outputMode, etc.
                                $data = array(
                        if (function_exists($commandFunction)) {
                                // Prepare $matches, $key, $outputMode, etc.
                                $data = array(

-                                       'matches'  => $matches,
-                                       'key'      => $key,
-                                       'mode'     => $outputMode,
-                                       'code'     => $code,
-                                       'callback' => $callback
+                                       'matches'    => $matches,
+                                       'key'        => $key,
+                                       'mode'       => $outputMode,
+                                       'code'       => $code,
+                                       'callback'   => $callback,
+                                       'extra_func' => $extraFunction

                                );
 
                                // Call it
                                );
 
                                // Call it

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 38ae7595f088fd2ad529288bd355349add8a9663..f5bb460ff1444c8ff45793d58af0370de06e7230 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -158,11 +158,11 @@ if ($totalLocked == '0') $totalLocked = '0.00000';
 
 // Remember several values in constants
 $content['sum']   = translateComma($totalPoints - getUserData('used_points'));
 
 // Remember several values in constants
 $content['sum']   = translateComma($totalPoints - getUserData('used_points'));

-$content['tref']  = $totalReferals;
+$content['tref']  = translateComma($totalReferals);

 $content['tlock'] = translateComma($totalLocked);
 
 // Fixes a bug when there is no bonus extension installed
 $content['tlock'] = translateComma($totalLocked);
 
 // Fixes a bug when there is no bonus extension installed

-if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', "X");
+if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', 'X');

 
 // Members shall see no special rows here
 $content['special_rows'] = '';
 
 // Members shall see no special rows here
 $content['special_rows'] = '';


@@ -208,9 +208,9 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 }
 
 // Remeber values for the final template
 }
 
 // Remeber values for the final template

-$content['receive']   = $RECEIVED;
-$content['confirmed'] = $CONFIRMED;
-$content['sent']      = $SENT;
+$content['receive']   = translateComma($RECEIVED);
+$content['confirmed'] = translateComma($CONFIRMED);
+$content['sent']      = translateComma($SENT);

 
 // Load final template
 if (isExtensionActive('user')) {
 
 // Load final template
 if (isExtensionActive('user')) {

diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index 1e501e73e63422fb1ca78d391fdf630e2535225a..5ade89c35386774596b725e8c5f66694d47935ef 100644 (file)
--- a/templates/de/html/member/member_points.tpl
+++ b/templates/de/html/member/member_points.tpl
@@ -36,7 +36,7 @@
        </tr>
        <tr>
                <td class="member_data">{--UNCONFIRMED_LOCKED--}:</td>
        </tr>
        <tr>
                <td class="member_data">{--UNCONFIRMED_LOCKED--}:</td>

-               <td class="member_data">{%user,ref_payout%}</td>
+               <td class="member_data">{%user,ref_payout,translateComma%}</td>

                <td class="member_data">-</td>
        </tr>
        <tr>
                <td class="member_data">-</td>
        </tr>
        <tr>