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

[sigurdne]

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

Modified Paths:
--------------
    branches/dev-syncromind-2/activitycalendar/inc/class.uiarena.inc.php

Modified: branches/dev-syncromind-2/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- branches/dev-syncromind-2/activitycalendar/inc/class.uiarena.inc.php        
2016-05-13 12:04:29 UTC (rev 15034)
+++ branches/dev-syncromind-2/activitycalendar/inc/class.uiarena.inc.php        
2016-05-13 12:04:32 UTC (rev 15035)
@@ -239,7 +239,7 @@
                        $sort_ascending = ($order[0]['dir'] == 'desc') ? false 
: true;
                        // Form variables
                        $search_for = $search['value'];
-                       $search_type = phpgw::get_var('search_option');
+                       $search_type = phpgw::get_var('search_option', 
'string', 'REQUEST', '');
 
                        // Create an empty result set
                        $result_objects = array();