Changeset 2298 for sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php

Timestamp:

01/15/2016 06:07:53 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets Dashboard: Centralize currency conversion and formatting.

These will be used by upcoming modules in addition to the current one.

Note that escaping was removed from format_amount(), since that should be done as late as possible.

wp_kses() is performant in this situation. See ​https://www.tollmanz.com/wp-kses-performance/

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/payment-requests-list-table.php

@@ -173 +173 @@
         $amount = get_post_meta( $request->ID, '_camppayments_payment_amount', true );
 
-        $amount = preg_replace( '#[^\d.-]+#', '', $amount );
-        $amount = floatval( $amount );
-
-        if ( strpos( $currency, 'null' ) === false && $amount ) {
-            $output = sprintf( '%s %s', esc_html( number_format( $amount, 2 ) ), esc_html( $currency ) );
-
-            if ( $currency != 'USD' ) {
-                $usd_amount = Payment_Requests_Dashboard::convert_currency( $currency, 'usd', $amount );
-                if ( $usd_amount )
-                    $output .= sprintf( '<br />~&nbsp;%s&nbsp;USD', esc_html( number_format( $usd_amount, 2 ) ) );
-            }
-
-            return $output;
-        } elseif ( $amount ) {
-            return esc_html( $amount );
-        }
+        return wp_kses(
+            \WordCamp\Budgets_Dashboard\format_amount( $amount, $currency ),
+            array( 'br' => array() )
+        );
     }