[Fmsystem-commits] [14319]

[Saul]

Revision: 14319
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14319
Author:   psaul
Date:     2015-11-10 17:24:52 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------


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  2015-11-10 
16:20:16 UTC (rev 14318)
+++ branches/dev-syncromind/booking/inc/class.socommon.inc.php  2015-11-10 
17:24:52 UTC (rev 14319)
@@ -433,9 +433,7 @@
                                }
                        }
                        
-                       $base_sql = "SELECT $cols FROM $this->table_name $joins 
WHERE $condition $order ";
-//                        echo $base_sql;exit();
-                        
+                       $base_sql = "SELECT $cols FROM $this->table_name $joins 
WHERE $condition $order ";                        
                        if ($results) 
                        {
                                $this->db->limit_query($base_sql, $start, 
__LINE__, __FILE__, $results);
@@ -443,6 +441,7 @@
                                $offset = ($start > 0) ?  'OFFSET ' . $start . 
' ' : ' ';
                                $this->db->query($base_sql.$offset, __LINE__, 
__FILE__);
                        }
+            
                        $results = array();
                        while ($this->db->next_record())
                        {
@@ -510,7 +509,6 @@
                                }
                        }
                    }
-
                     return array(
                             'total_records' => $total_records,
                             'results'          => $results,