[Fmsystem-commits] [13998] change $date_format

[Nelson Guerra]

Revision: 13998
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13998
Author:   nelson224
Date:     2015-09-23 22:17:11 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
change $date_format

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

Modified: 
branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php  
2015-09-23 22:16:21 UTC (rev 13997)
+++ branches/dev-syncromind/rental/inc/model/class.contract_price_item.inc.php  
2015-09-23 22:17:11 UTC (rev 13998)
@@ -179,8 +179,8 @@
                public function serialize()
                {       
                        $currency_prefix = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'];
-                       //$date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-                       $date_format="Y/m/d";
+                       $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       //$date_format="Y/m/d";
                        return array(
                                'id' => $this->get_id(),
                                'price_item_id' => $this->get_price_item_id(),
@@ -200,8 +200,8 @@
                                // happy about empty values if a custom parser 
is set, so we use the YUI built
                                // in "date" parser which requires a format 
like: 2009/07/30 to work. 
                                // EHL: Removed 2009-10-27, due to change to 
int datatype. 
-                               'date_start' => 
$this->get_date_start()!=NULL?date($date_format, $this->get_date_start()):null, 
 
-                               'date_end' => 
$this->get_date_end()!=NULL?date($date_format, $this->get_date_end()):null,
+                               'date_start' => 
$this->get_date_start()!=NULL?date($date_format, $this->get_date_start()):'',  
+                               'date_end' => 
$this->get_date_end()!=NULL?date($date_format, $this->get_date_end()):'',
                                'price_type_title' => 
lang($this->get_price_type_title()),
                        );
                }