fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17195] fix FDV-296


From: sigurdne
Subject: [Fmsystem-commits] [17195] fix FDV-296
Date: Tue, 24 Oct 2017 09:58:02 -0400 (EDT)

Revision: 17195
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17195
Author:   sigurdne
Date:     2017-10-24 09:58:02 -0400 (Tue, 24 Oct 2017)
Log Message:
-----------
fix FDV-296

Modified Paths:
--------------
    trunk/property/inc/class.soworkorder.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2017-10-24 13:57:27 UTC 
(rev 17194)
+++ trunk/property/inc/class.soworkorder.inc.php        2017-10-24 13:58:02 UTC 
(rev 17195)
@@ -1014,7 +1014,7 @@
                                        );
 
                                $file_attachments = 
trim($this->db->f('file_attachments'), ',');
-                               $workorder['file_attachments'] = $workorder ? 
explode(',', $file_attachments) : array();
+                               $workorder['file_attachments'] = 
$file_attachments ? explode(',', $file_attachments) : array();
 
                                $sql = "SELECT periodization_id,"
                                        . " sum(fm_workorder_budget.budget) AS 
budget, sum(fm_workorder_budget.combined_cost) AS combined_cost,"

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2017-10-24 13:57:27 UTC (rev 
17194)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2017-10-24 13:58:02 UTC (rev 
17195)
@@ -3469,7 +3469,7 @@
 
                        $dir = 
"{$GLOBALS['phpgw_info']['server']['temp_dir']}/pdf_files";
                        $attachments = array();
-                       if (isset($workorder['file_attachments']) && 
is_array($workorder['file_attachments']))
+                       if (!empty($workorder['file_attachments']) && 
is_array($workorder['file_attachments']))
                        {
                                $attachments = 
CreateObject('property.bofiles')->get_attachments($workorder['file_attachments']);
                                $_attachment_log = array();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]