Changeset 2468:d7fda5a0bd39 for inc/core

Timestamp:

10/21/13 09:08:36 (12 years ago)

Author:

Dsls

Branch:

twig

Children:

2593:6741802596a0, 2609:c26642f775e2

Parents:

2321:3ab5e6c3d301 (diff), 2466:e42d3233f080 (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 2.6

Files:

• inc/core/class.dc.blog.php (modified) (4 diffs)
• inc/core/class.dc.blog.php (modified) (4 diffs)

inc/core/class.dc.blog.php

@@ -771 +771 @@
           if ($count_only)
           {
-               $strReq = 'SELECT count(P.post_id) ';
+               $strReq = 'SELECT count(DISTINCT P.post_id) ';
           }
           elseif (!empty($params['sql_only'])) 
@@ -791 +791 @@
                }
                
+
                $strReq =
                'SELECT P.post_id, P.blog_id, P.user_id, P.cat_id, post_dt, '.
@@ -807 +808 @@
           'LEFT OUTER JOIN '.$this->prefix.'category C ON P.cat_id = C.cat_id ';
 
-          if (isset($params['media'])) {
-               if ($params['media'] == '0') {
-                    $strReq .= 'LEFT OUTER JOIN '.$this->prefix.'post_media M on P.post_id = M.post_id ';
-               } else {
-                    $strReq .= 'INNER JOIN '.$this->prefix.'post_media M on P.post_id = M.post_id ';
-               }
-               if (isset($params['link_type'])) {
-                    $strReq .= " and M.link_type ".$this->con->in($params['link_type'])." ";
-               }
-          }
-          
           if (!empty($params['from'])) {
                $strReq .= $params['from'].' ';
@@ -950 +940 @@
           if (isset($params['media'])) {
                if ($params['media'] == '0') {
-                    $strReq .= ' AND M.post_id IS NULL ';
-               }
+                    $strReq .= 'AND NOT ';
+               } else {
+                    $strReq .= 'AND ';                 
+               }
+               $strReq .= 'EXISTS (SELECT M.post_id FROM '.$this->prefix.'post_media M '.
+                    'WHERE M.post_id = P.post_id ';
+               if (isset($params['link_type'])) {
+                    $strReq .= " AND M.link_type ".$this->con->in($params['link_type'])." ";
+               }
+               $strReq .= ")";
           }
 
           if (!empty($params['sql'])) {
                $strReq .= $params['sql'].' ';
-          }
-          
-          if (!$count_only && isset($params['media'])) {
-               $strReq .= ' GROUP BY P.post_id ';
           }
 

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = http::getHostFromURL($this->url);
+               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -865 +865 @@
           
           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'])." ";
           }
           
@@ -963 +963 @@
                     $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']);
+               }
           }