[Fmsystem-commits] [14686] more on booking

[Sigurd Nes]

Revision: 14686
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14686
Author:   sigurdne
Date:     2016-02-01 11:50:32 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
more on booking

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.socommon.inc.php

Modified: branches/dev-syncromind/booking/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.socommon.inc.php  2016-02-01 
10:13:06 UTC (rev 14685)
+++ branches/dev-syncromind/booking/inc/class.socommon.inc.php  2016-02-01 
11:50:32 UTC (rev 14686)
@@ -146,7 +146,7 @@
                                }
                                else if(isset($params['join']) && 
$params['join'])
                                {
-                                       if($params['join_type'] == 'manytomany' 
&& ! isset($filters[$field]))
+                                       if($params['join_type'] == 'manytomany' 
&& !isset($filters[$field]) && !$filters[$field])
                                        {
                                                continue;
                                        }
@@ -375,6 +375,10 @@
                                                $column = $params['join'] ? 
$params['join']['column'] : $field;
                                                if($params['type'] == 'int')
                                                {
+                                                       if(!(int)$query)
+                                                       {
+                                                               continue;
+                                                       }
                                                        $like_clauses[] = 
"{$table}.{$column} = " . (int)$query;//$this->db->db_addslashes($query);
                                                }
                                                else