[Fmsystem-commits] [15992]

[nelson . guerra]

Revision: 15992
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15992
Author:   nelson224
Date:     2016-11-12 02:48:47 +0000 (Sat, 12 Nov 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-11-11 13:26:20 UTC (rev 15991)
+++ branches/dev-syncromind-2/property/inc/class.sogeneric_document.inc.php     
2016-11-12 02:48:47 UTC (rev 15992)
@@ -167,9 +167,14 @@
                        return $values;
                }
                
-               public function get_file_relations($location_id, $file_id) 
+               public function get_file_relations($file_id, $location_id = 
null) 
                {
-                       $filtermethod = "WHERE location_id = {$location_id} AND 
file_id = {$file_id}";
+                       if ($location_id)
+                       {
+                               $filtermethod = "WHERE location_id = 
{$location_id} AND file_id = {$file_id}";
+                       } else {
+                               $filtermethod = "WHERE file_id = {$file_id}";
+                       }
                        
                        $sql = "SELECT * FROM phpgw_vfs_file_relation " ." 
{$filtermethod} ";
                        $this->db->query($sql, __LINE__, __FILE__);