[Fmsystem-commits] [14204] allow php pre 5.5

[Sigurd Nes]

Revision: 14204
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14204
Author:   sigurdne
Date:     2015-10-19 10:24:07 +0000 (Mon, 19 Oct 2015)
Log Message:
-----------
allow php pre 5.5

Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.uibilling.inc.php

Modified: branches/dev-syncromind/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uibilling.inc.php  2015-10-17 
00:35:40 UTC (rev 14203)
+++ branches/dev-syncromind/rental/inc/class.uibilling.inc.php  2015-10-19 
10:24:07 UTC (rev 14204)
@@ -597,11 +597,11 @@
                }       
 
                $code = <<<JS
-                       var thousandsSeparator = '$this->thousandsSeparator';
-                       var decimalSeparator = '$this->decimalSeparator';
-                       var decimalPlaces = '$this->decimalPlaces';
-                       var currency_suffix = '$this->currency_suffix';
-                       var area_suffix = '$this->area_suffix';
+                       var thousandsSeparator = '{$this->thousandsSeparator}';
+                       var decimalSeparator = '{$this->decimalSeparator}';
+                       var decimalPlaces = '{$this->decimalPlaces}';
+                       var currency_suffix = '{$this->currency_suffix}';
+                       var area_suffix = '{$this->area_suffix}';
 JS;
                $GLOBALS['phpgw']->js->add_code('', $code);
                        
@@ -746,11 +746,11 @@
                        );
 
                $code = <<<JS
-                       var thousandsSeparator = '$this->thousandsSeparator';
-                       var decimalSeparator = '$this->decimalSeparator';
-                       var decimalPlaces = '$this->decimalPlaces';
-                       var currency_suffix = '$this->currency_suffix';
-                       var area_suffix = '$this->area_suffix';
+                       var thousandsSeparator = '{$this->thousandsSeparator}';
+                       var decimalSeparator = '{$this->decimalSeparator}';
+                       var decimalPlaces = '{$this->decimalPlaces}';
+                       var currency_suffix = '{$this->currency_suffix}';
+                       var area_suffix = '{$this->area_suffix}';
 JS;
                $GLOBALS['phpgw']->js->add_code('', $code);
                
@@ -851,14 +851,15 @@
                
                $sum =  number_format($billing_job->get_total_sum(), 
$this->decimalPlaces, $this->decimalSeparator, $this->thousandsSeparator).' 
'.$this->currency_suffix;
                $last_updated = 
$GLOBALS['phpgw']->common->show_date($billing_job->get_timestamp_stop(),$this->dateFormat
 . ' H:i:s');
+               $timestamp_commit = $billing_job->get_timestamp_commit();
                                
-               if(empty($billing_job->get_timestamp_commit()))
+               if(empty($timestamp_commit))
                {
                        $timestamp_commit = lang('No');
                }
                else
                {
-                       $timestamp_commit = 
$GLOBALS['phpgw']->common->show_date($billing_job->get_timestamp_commit(), 
$this->dateFormat . ' H:i:s');
+                       $timestamp_commit = 
$GLOBALS['phpgw']->common->show_date($timestamp_commit, $this->dateFormat . ' 
H:i:s');
                }
                        
                $tabletools[] = array
@@ -966,11 +967,11 @@
                );
                
                $code = <<<JS
-                       var thousandsSeparator = '$this->thousandsSeparator';
-                       var decimalSeparator = '$this->decimalSeparator';
-                       var decimalPlaces = '$this->decimalPlaces';
-                       var currency_suffix = '$this->currency_suffix';
-                       var area_suffix = '$this->area_suffix';
+                       var thousandsSeparator = '{$this->thousandsSeparator}';
+                       var decimalSeparator = '{$this->decimalSeparator}';
+                       var decimalPlaces = '{$this->decimalPlaces}';
+                       var currency_suffix = '{$this->currency_suffix}';
+                       var area_suffix = '{$this->area_suffix}';
                                
                        function formatterPrice (key, oData) 
                        {