[xoops-svn] SF.net SVN: xoops-svn:[10360] XoopsCore/branches/2.6.x/2.6.0/htdocs/class/ model

[<du...@us...>]

Revision: 10360
          http://sourceforge.net/p/xoops/svn/10360
Author:   dugris
Date:     2012-12-11 17:19:50 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
fix class/model

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php	2012-12-11 14:36:16 UTC (rev 10359)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php	2012-12-11 17:19:50 UTC (rev 10360)
@@ -94,13 +94,13 @@
         $sql = " SELECT {$select}" . " FROM {$this->handler->table} AS o" . " LEFT JOIN {$this->handler->table_link} AS l ON o.{$this->handler->field_object} = l.{$this->handler->field_link}";
         if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) {
             $sql .= " " . $criteria->renderWhere();
+            if ($criteria->getGroupby() != '') {
+                $sql .= ' GROUP BY (' . $criteria->getGroupby() . ')';
+            }
             if ($sort = $criteria->getSort()) {
                 $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
                 $orderSet = true;
             }
-            if ($criteria->get