Changeset 1155:49ba58cbf593 for inc/core

Timestamp:

04/09/13 09:15:41 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1154:e85c1417b8a4 (diff), 1143:fbf575ae9bda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with default

Files:

• inc/core/class.dc.blog.php (modified) (2 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -805 +805 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
           }
           
@@ -889 +889 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }
           

inc/core/class.dc.blog.php

@@ -228 +228 @@
                'SELECT post_id, COUNT(post_id) AS nb_comment,comment_trackback '.
                'FROM '.$this->prefix.'comment '.
-               'WHERE post_id'.$this->con->in($a_ids).
-               'AND comment_status = 1 ';
+               'WHERE comment_status = 1 '.
+               (count($a_ids) > 0 ? 'AND post_id'.$this->con->in($a_ids) : ' ');
           
           if ($del) {