Changeset 1542:2de80618299a

Timestamp:

08/03/13 18:04:19 (12 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1430

Parents:

1541:4a3f328d2a74 (diff), 1262:ec1e7bef6c1f (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:

Fusion avec 2.5

Files:

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

inc/core/class.dc.blog.php

@@ -696 +696 @@
      - no_content: Don't retrieve entry content (excerpt and content)
      - post_type: Get only entries with given type (default "post", array for many types and '' for no type)
-     - post_id: (integer) Get entry with given post_id
+     - post_id: (integer or array) Get entry with given post_id
      - post_url: Get entry with given post_url field
      - user_id: (integer) Get entries belonging to given user ID
@@ -716 +716 @@
      - limit: Limit parameter
      - sql_only : return the sql request instead of results. Only ids are selected
+     - exclude_post_id : (integer or array) Exclude entries with given post_id
      
      Please note that on every cat_id or cat_url, you can add ?not to exclude
@@ -809 +810 @@
                }
                $strReq .= 'AND P.post_id '.$this->con->in($params['post_id']);
+          }
+          
+          if (isset($params['exclude_post_id']) && $params['exclude_post_id'] !== '') {
+               if (is_array($params['exclude_post_id'])) {
+                    array_walk($params['exclude_post_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
+               } else {
+                    $params['exclude_post_id'] = array((integer) $params['exclude_post_id']);
+               }
+               $strReq .= 'AND P.post_id not in ('.$this->con->in($params['exclude_post_id']).') ';
           }
           

inc/core/class.dc.blog.php

@@ -203 +203 @@
      @param    ids       <b>mixed</b>        Comment(s) ID(s)
      @param    del       <b>boolean</b>      If comment is delete, set this to true
-     */
-     public function triggerComments($ids,$del=false)
+     @param    affected_posts      <b>mixed</b>        Posts(s) ID(s)
+     */
+     public function triggerComments($ids, $del=false, $affected_posts=null)
      {
           $co_ids = dcUtils::cleanIds($ids);
+          $a_ids = dcUtils::cleanIds($affected_posts);
+          $a_tbs = array();
           
           # a) Retrieve posts affected by comments edition
-          $strReq = 
-               'SELECT post_id, comment_trackback '.
-               'FROM '.$this->prefix.'comment '.
-               'WHERE comment_id'.$this->con->in($co_ids).
-               'GROUP BY post_id,comment_trackback';
-          
-          $rs = $this->con->select($strReq);
-          
-          $a_ids = $a_tbs = array();
-          while ($rs->fetch()) {
-               $a_ids[] = (integer) $rs->post_id;
-               $a_tbs[] = (integer) $rs->comment_trackback;
+          if (empty($a_ids)) {
+               $strReq = 
+                    'SELECT post_id, comment_trackback '.
+                    'FROM '.$this->prefix.'comment '.
+                    'WHERE comment_id'.$this->con->in($co_ids).
+                    'GROUP BY post_id,comment_trackback';
+               
+               $rs = $this->con->select($strReq);
+               
+               while ($rs->fetch()) {
+                    $a_ids[] = (integer) $rs->post_id;
+                    $a_tbs[] = (integer) $rs->comment_trackback;
+               }
           }
           
@@ -255 +259 @@
           {
                $nb_comment = $nb_trackback = 0;
+               //$cur->nb_comment = $nb_comment;
                foreach($b_ids as $b_key => $b_id)
                {
@@ -505 +510 @@
           $this->core->callBehavior('coreBeforeCategoryCreate',$this,$cur);
           
-          $this->categories()->addNode($cur,$parent);
+          $id = $this->categories()->addNode($cur,$parent);
+          # Update category's cursor
+          $rs = $this->getCategory($id);
+          if (!$rs->isEmpty()) {
+               $cur->cat_lft = $rs->cat_lft;
+               $cur->cat_rgt = $rs->cat_rgt;
+          }
           
           # --BEHAVIOR-- coreAfterCategoryCreate
@@ -2191 +2202 @@
           $co_ids = dcUtils::cleanIds($ids);
           
-          if (empty($ids)) {
+          if (empty($co_ids)) {
                throw new Exception(__('No such comment ID'));
+          }
+          
+          # Retrieve posts affected by comments edition
+          $affected_posts = array();
+          $strReq =
+               'SELECT distinct(post_id) '.
+               'FROM '.$this->prefix.'comment '.
+               'WHERE comment_id'.$this->con->in($co_ids);
+          
+          $rs = $this->con->select($strReq);
+          
+          while ($rs->fetch()) {
+               $affected_posts[] = (integer) $rs->post_id;
           }
           
@@ -2222 +2246 @@
           
           $this->con->execute($strReq);
-          $this->triggerComments($co_ids,true);
+          $this->triggerComments($co_ids, true, $affected_posts);
           $this->triggerBlog();
      }