[Fmsystem-commits] [15126] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15126
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15126
Author:   sigurdne
Date:     2016-05-13 12:24:40 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php

Modified: branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-05-13 12:24:37 UTC (rev 15125)
+++ branches/dev-syncromind-2/rental/inc/class.socomposite.inc.php      
2016-05-13 12:24:40 UTC (rev 15126)
@@ -25,7 +25,7 @@
                        return self::$so;
                }
 
-               protected function get_query( string $sort_field, boolean 
$ascending, string $search_for, string $search_type, array $filters, boolean 
$return_count )
+               protected function get_query( string $sort_field, bool 
$ascending, string $search_for, string $search_type, array $filters, bool 
$return_count )
                {
                        $location_id_into = 
$GLOBALS['phpgw']->locations->get_id('rental', '.RESPONSIBILITY.INTO');