From: quix0r <quix0r@mxchange.org>
Date: Fri, 18 Dec 2009 20:55:04 +0000 (+0000)
Subject: Fix of display-bug in member's overview of points (what=points) and extra call-back... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da080af327c1c37c377ead80415905295681eb3c;p=mailer.git

Fix of display-bug in member's overview of points (what=points) and extra call-back function wasn't called
---

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 4af9076838..5e2bb0a9ca 100644
--- 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)
-	if (!empty($extraFunction)) {
+	if (!empty($data['extra_func'])) {
 		// Surround the original function call with it
-		$functionName = $extraFunction . '(' . $functionName . ')';
+		$functionName = $data['extra_func'] . '(' . $functionName . ')';
 	} // END - if
 
 	// Now replace the code
diff --git a/inc/filters.php b/inc/filters.php
index 9345e507e2..627a4007b8 100644
--- 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(
-					'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
diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 38ae7595f0..f5bb460ff1 100644
--- 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'));
-$content['tref']  = $totalReferals;
+$content['tref']  = translateComma($totalReferals);
 $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'] = '';
@@ -208,9 +208,9 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 }
 
 // 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')) {
diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl
index 1e501e73e6..5ade89c353 100644
--- 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>
-		<td class="member_data">{%user,ref_payout%}</td>
+		<td class="member_data">{%user,ref_payout,translateComma%}</td>
 		<td class="member_data">-</td>
 	</tr>
 	<tr>