[Fmsystem-commits] [15891] Syncromind: merge 15889:15890 from trunk

[sigurdne]

Revision: 15891
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15891
Author:   sigurdne
Date:     2016-10-24 13:43:41 +0000 (Mon, 24 Oct 2016)
Log Message:
-----------
Syncromind: merge 15889:15890 from trunk

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

Property Changed:
----------------
    branches/dev-syncromind-2/


Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795,15797-15798,15800-15812,15814-15838,15840,15842-15888
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795,15797-15798,15800-15812,15814-15838,15840,15842-15888,15890

Modified: branches/dev-syncromind-2/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind-2/phpgwapi/inc/class.socommon.inc.php       
2016-10-24 13:42:00 UTC (rev 15890)
+++ branches/dev-syncromind-2/phpgwapi/inc/class.socommon.inc.php       
2016-10-24 13:43:41 UTC (rev 15891)
@@ -227,7 +227,7 @@
                        }
 
                        $base_sql = "SELECT $cols FROM $this->table_name $joins 
WHERE $condition $order ";
-                       if ($results)
+                       if ($results > -1)
                        {
                                $this->db->limit_query($base_sql, $start, 
__LINE__, __FILE__, $results);
                        }