From 4916f98bcba38b86798710bc7645519dac6e7176 Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 14 Apr 2015 13:04:46 +0200 Subject: [PATCH 1/2] Fix currency symbol when no dollars are chosen --- application/helpers/currency_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/helpers/currency_helper.php b/application/helpers/currency_helper.php index d4ca49356..a63565586 100644 --- a/application/helpers/currency_helper.php +++ b/application/helpers/currency_helper.php @@ -4,7 +4,7 @@ function to_currency($number,$escape=FALSE) { $CI =& get_instance(); $currency_symbol = $CI->config->item('currency_symbol') ? $CI->config->item('currency_symbol') : '$'; - $currency_symbol = $currency_symbol == '$' && $escape ? '\$' : '$'; + $currency_symbol = $currency_symbol == '$' && $escape ? '\$' : $currency_symbol; $thousands_separator = $CI->config->item('thousands_separator') ? $CI->config->item('thousands_separator') : ''; $decimal_point = $CI->config->item('decimal_point') ? $CI->config->item('decimal_point') : '.'; if($number >= 0) @@ -28,4 +28,4 @@ function to_currency_no_money($number) { return number_format($number, 2, '.', ''); } -?> \ No newline at end of file +?> From afa203e73c2eaf87f66dff1112cacf3d80994096 Mon Sep 17 00:00:00 2001 From: Kamaro Lambert Date: Mon, 30 Nov 2015 23:30:56 +0200 Subject: [PATCH 2/2] Fixed error Only variable references should be returned by reference Severity: Notice Message: Only variable references should be returned by reference Filename: core/Common.php Line Number: 257 --- system/core/Common.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/core/Common.php b/system/core/Common.php index 713b21d85..aff7e94e8 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -253,8 +253,8 @@ if ( ! function_exists('get_config')) } } } - - return $_config[0] =& $config; + $_config[0] =& $config; + return $_config[0]; } } @@ -561,4 +561,4 @@ if ( ! function_exists('html_escape')) } /* End of file Common.php */ -/* Location: ./system/core/Common.php */ \ No newline at end of file +/* Location: ./system/core/Common.php */