[Fmsystem-commits] [9902]

[Torstein]

Revision: 9902
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9902
Author:   vator
Date:     2012-08-22 12:02:00 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-08-22 11:58:22 UTC 
(rev 9901)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-08-22 12:02:00 UTC 
(rev 9902)
@@ -204,7 +204,11 @@
                public function 
get_controls_for_components_by_location($location_code, $from_date, $to_date, 
$repeat_type, $return_type = "return_object", $role_id = 0)
                {
                        $role_id = (int) $role_id;
-                       $repeat_type = (int) $repeat_type;
+                       
+                       if($repeat_type != null)
+                       {
+                         $repeat_type = (int) $repeat_type;
+                       }
 
                        $controls_array = array();
                        
@@ -215,7 +219,7 @@
                        $sql .= "LEFT JOIN fm_bim_item ON fm_bim_item.id = 
ccl.component_id ";
                        $sql .= "WHERE fm_bim_item.loc1 = '$location_code' ";
                        
-                       if( $repeat_type )
+                       if( $repeat_type =! null)
                        {
                                $sql .= "AND c.repeat_type = $repeat_type ";
                        }