Changeset 2628:a46041c31f11

Timestamp:

01/03/14 08:39:19 (10 years ago)

Author:

Dsls

Branch:

default

Parents:

2617:5117532eb684 (diff), 2627:9d1adf085d11 (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) (2 diffs)

inc/core/class.dc.blog.php

@@ -2204 +2204 @@
 
           $strReq =
-               'UPDATE '.$this->prefix.'comment tc ';
-
-          # mySQL uses "JOIN" synthax
-          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq .=
-                    'JOIN '.$this->prefix.'post tp ON tc.post_id = tp.post_id ';
-          }
-
+               'UPDATE '.$this->prefix.'comment '.
+               'SET comment_status = '.$status.' ';
           $strReq .=
-               'SET comment_status = '.$status.' ';
-
-          # pgSQL uses "FROM" synthax
-          if ($this->con->driver() != 'mysql' && $this->con->driver() != 'mysqli') {
-               $strReq .=
-                    'FROM '.$this->prefix.'post tp ';
-          }
-
-          $strReq .=
-               "WHERE blog_id = '".$this->con->escape($this->id)."' ".
-               'AND comment_id'.$this->con->in($co_ids);
-
-          # add pgSQL "WHERE" clause
-          if ($this->con->driver() != 'mysql' && $this->con->driver() != 'mysqli') {
-               $strReq .=
-                    'AND tc.post_id = tp.post_id ';
-          }
-
-          #If user is only usage, we need to check the post's owner
+               'WHERE comment_id'.$this->con->in($co_ids).
+               'AND post_id in (SELECT tp.post_id '.
+               'FROM '.$this->prefix.'post tp '.
+               "WHERE tp.blog_id = '".$this->con->escape($this->id)."' ";
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
@@ -2237 +2216 @@
                     "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
           }
-
+          $strReq .= ')';
           $this->con->execute($strReq);
           $this->triggerComments($co_ids);
@@ -2284 +2263 @@
           }
 
-          # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq =
-                    'DELETE FROM tc '.
-                    'USING '.$this->prefix.'comment tc '.
-                    'INNER JOIN '.$this->prefix.'post tp ';
-          }
-          # pgSQL uses nothing special
-          else {
-               $strReq =
-                    'DELETE FROM '.$this->prefix.'comment tc '.
-                    'USING '.$this->prefix.'post tp ';
-          }
-
-          $strReq .=
-               'WHERE tc.post_id = tp.post_id '.
-               "AND tp.blog_id = '".$this->con->escape($this->id)."' ".
-               'AND comment_id'.$this->con->in($co_ids);
-
+          $strReq =
+               'DELETE FROM '.$this->prefix.'comment '.
+               'WHERE comment_id'.$this->con->in($co_ids).' '.
+               'AND post_id in (SELECT tp.post_id '.
+               'FROM '.$this->prefix.'post tp '.
+               "WHERE tp.blog_id = '".$this->con->escape($this->id)."' ";
           #If user can only delete, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
                $strReq .=
-                    "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-          }
-
+                    "AND tp.user_id = '".$this->con->escape($this->core->auth->userID())."' ";
+          }
+          $strReq .= ")";
           $this->con->execute($strReq);
           $this->triggerComments($co_ids, true, $affected_posts);
@@ -2321 +2287 @@
           }
 
-          # mySQL uses "INNER JOIN" synthax
-          if ($this->con->driver() == 'mysql' || $this->con->driver() == 'mysqli') {
-               $strReq =
-                    'DELETE FROM tc '.
-                    'USING '.$this->prefix.'comment tc '.
-                    'INNER JOIN '.$this->prefix.'post tp ';
-          }
-          # pgSQL uses nothing special
-          else {
-               $strReq =
-                    'DELETE FROM '.$this->prefix.'comment tc '.
-                    'USING '.$this->prefix.'post tp ';
-          }
-
-          $strReq .=
-               'WHERE tc.post_id = tp.post_id '.
-               "AND tp.blog_id = '".$this->con->escape($this->id)."' ".
-               'AND comment_status = -2';
-
+          $strReq =
+               'DELETE FROM '.$this->prefix.'comment '.
+               'WHERE comment_status = -2 '.
+               'AND post_id in (SELECT tp.post_id '.
+               'FROM '.$this->prefix.'post tp '.
+               "WHERE tp.blog_id = '".$this->con->escape($this->id)."' ";
           #If user can only delete, we need to check the post's owner
           if (!$this->core->auth->check('contentadmin',$this->id))
           {
                $strReq .=
-                    "AND user_id = '".$this->con->escape($this->core->auth->userID())."' ";
-          }
-
+                    "AND tp.user_id = '".$this->con->escape($this->core->auth->userID())."' ";
+          }
+          $strReq .= ")";
           $this->con->execute($strReq);
           $this->triggerBlog();

inc/core/class.dc.blog.php

@@ -1894 +1894 @@
      - post_id: (integer) Get comments belonging to given post_id
      - cat_id: (integer or array) Get comments belonging to entries of given category ID
-     - comment_id: (integer) Get comment with given ID
+     - comment_id: (integer or array) Get comment with given ID (or IDs)
      - comment_site: (string) Get comments with given comment_site
      - comment_status: (integer) Get comments with given comment_status
@@ -1984 +1984 @@
 
           if (isset($params['comment_id']) && $params['comment_id'] !== '') {
-               $strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
+               if (is_array($params['comment_id'])) {
+                    array_walk($params['comment_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
+               } else {
+                    $params['comment_id'] = array((integer) $params['comment_id']);
+               }
+               $strReq .= 'AND comment_id '.$this->con->in($params['comment_id']);
           }