From 5a5ba1e5c001de161fbeb19d6d662391dccc4c1e Mon Sep 17 00:00:00 2001
From: Jonathon Menz <jonomenz@gmail.com>
Date: Fri, 1 Jun 2018 12:52:22 -0700
Subject: [PATCH] Fix: negative values in read only currency field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126)
---
 src/Forms/CurrencyField_Disabled.php | 2 +-
 src/Forms/CurrencyField_Readonly.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Forms/CurrencyField_Disabled.php b/src/Forms/CurrencyField_Disabled.php
index 26a5106f8..7e743755e 100644
--- a/src/Forms/CurrencyField_Disabled.php
+++ b/src/Forms/CurrencyField_Disabled.php
@@ -22,7 +22,7 @@ class CurrencyField_Disabled extends CurrencyField
     {
         if ($this->value) {
             $val = Convert::raw2xml($this->value);
-            $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.]/', "", $val), 2);
+            $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2);
             $valforInput = Convert::raw2att($val);
         } else {
             $valforInput = '';
diff --git a/src/Forms/CurrencyField_Readonly.php b/src/Forms/CurrencyField_Readonly.php
index 866c09c61..775b9eb6b 100644
--- a/src/Forms/CurrencyField_Readonly.php
+++ b/src/Forms/CurrencyField_Readonly.php
@@ -20,7 +20,7 @@ class CurrencyField_Readonly extends ReadonlyField
     {
         if ($this->value) {
             $val = Convert::raw2xml($this->value);
-            $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.]/', "", $val), 2);
+            $val = _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . number_format(preg_replace('/[^0-9.-]/', "", $val), 2);
             $valforInput = Convert::raw2att($val);
         } else {
             $val = '<i>' . _t('SilverStripe\\Forms\\CurrencyField.CURRENCYSYMBOL', '$') . '0.00</i>';