[Fmsystem-commits] [15171]

[nelson . guerra]

Revision: 15171
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15171
Author:   nelson224
Date:     2016-05-18 00:34:33 +0000 (Wed, 18 May 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php     
2016-05-18 00:34:20 UTC (rev 15170)
+++ branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php     
2016-05-18 00:34:33 UTC (rev 15171)
@@ -124,6 +124,7 @@
                                {
                                        $this->db->query($sql . $ordermethod, 
__LINE__, __FILE__);
                                }
+                               $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
 
                                while ($this->db->next_record())
                                {
@@ -133,8 +134,8 @@
                                                'owner_id' => 
$this->db->f('owner_id'),
                                                'createdby_id' => 
$this->db->f('createdby_id'),
                                                'modifiedby_id' => 
$this->db->f('modifiedby_id'),
-                                               'created' => 
$this->db->f('created'),
-                                               'modified' => 
$this->db->f('modified'),
+                                               'created' => 
$GLOBALS['phpgw']->common->show_date(strtotime($this->db->f('created')), 
$dateformat),
+                                               'modified' => 
$GLOBALS['phpgw']->common->show_date(strtotime($this->db->f('modified')), 
$dateformat),
                                                'size' => $this->db->f('size'),
                                                'mime_type' => 
$this->db->f('mime_type', true),
                                                'app' => $this->db->f('app'),