Changeset 833:e52d87b4cbd1

Timestamp:

05/24/12 09:04:39 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Children:

835:dbc60fa508df, 836:3a54ff018a83

Message:

Small tuning in scheduled entries management,
Updated TemplatePrepareParams? behavior

Location:

inc

Files:

• core/class.dc.blog.php (modified) (4 diffs)
• public/class.dc.template.php (modified) (10 diffs)

inc/core/class.dc.blog.php

@@ -672 +672 @@
           $params = new ArrayObject($params);
           $this->core->callBehavior('coreBlogBeforeGetPosts',$params);
-          $params = (array)$params;
 
           if ($count_only)
@@ -1393 +1392 @@
           
           $now = dt::toUTC(time());
-          $to_change = array();
-          
+          $to_change = new ArrayObject();
+
           if ($rs->isEmpty()) {
                return;
@@ -1412 +1411 @@
                }
           }
-          
-          if (!empty($to_change))
+          if (count($to_change))
           {
                # --BEHAVIOR-- coreBeforeScheduledEntriesPublish
-               $to_change = new ArrayObject($to_change);
                $this->core->callBehavior('coreBeforeScheduledEntriesPublish',$this,$to_change);
-               $to_change = (array)$to_change;
 
                $strReq =
@@ -1424 +1420 @@
                'post_status = 1 '.
                "WHERE blog_id = '".$this->con->escape($this->id)."' ".
-               'AND post_id '.$this->con->in($to_change).' ';
-               
+               'AND post_id '.$this->con->in((array)$to_change).' ';
                $this->con->execute($strReq);
                $this->triggerBlog();
 
                # --BEHAVIOR-- coreAfterScheduledEntriesPublish
-               $to_change = new ArrayObject($to_change);
                $this->core->callBehavior('coreAfterScheduledEntriesPublish',$this,$to_change);
           }

inc/public/class.dc.template.php

@@ -572 +572 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","Archives", $attr,$content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Archives","method" => "blog::getDates"), 
+               $attr,$content);
           $res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
           $res .= "?>\n";
@@ -680 +682 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","ArchiveNext", $attr, $content);
+          $res .= $this->core->callBehavior("templatePrepareParams",
+               array("tag" => "ArchiveNext","method" => "blog::getDates"), 
+               $attr, $content);
           $res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
           $res .= "?>\n";
@@ -717 +721 @@
           
           $res = "<?php\n";
-          $res .= $this->core->callBehavior("templatePrepareParams","ArchivePrevious", $attr, $content);
+          $res .= $this->core->callBehavior("templatePrepareParams",
+               array("tag" => "ArchivePrevious","method" => "blog::getDates"), 
+               $attr, $content);
           $res .= $p;
           $res .= '$_ctx->archives = $core->blog->getDates($params); unset($params);'."\n";
@@ -940 +946 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","Categories", $attr, $content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Categories","method" => "blog::getCategories"), 
+               $attr,$content);
           $res .= '$_ctx->categories = $core->blog->getCategories($params);'."\n";
           $res .= "?>\n";
@@ -1210 +1218 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","Entries",$attr,$content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Entries","method" => "blog::getPosts"), 
+               $attr,$content);
           $res .= '$_ctx->post_params = $params;'."\n";
           $res .= '$_ctx->posts = $core->blog->getPosts($params); unset($params);'."\n";
@@ -1880 +1890 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","Languages",$attr,$content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Languages","method" => "blog::getLangs"), 
+               $attr,$content);
           $res .= '$_ctx->langs = $core->blog->getLangs($params); unset($params);'."\n";
           $res .= "?>\n";
@@ -1955 +1967 @@
           $p = "<?php\n";
           $p .= '$params = $_ctx->post_params;'."\n";
+          $p .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Pagination","method" => "blog::getPosts"), 
+               $attr,$content);
           $p .= '$_ctx->pagination = $core->blog->getPosts($params,true); unset($params);'."\n";
           $p .= "?>\n";
@@ -1964 +1979 @@
           return
                $p.
-               $this->core->callBehavior("templatePrepareParams","Pagination",$attr,$content).
                '<?php if ($_ctx->pagination->f(0) > $_ctx->posts->count()) : ?>'.
                $content.
@@ -2104 +2118 @@
           
           $res = "<?php\n";
-          $res .= $this->core->callBehavior("templatePrepareParams","Comments",$attr,$content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Comments","method" => "blog::getComments"), 
+               $attr,$content);
           $res .= $p;
           $res .= '$_ctx->comments = $core->blog->getComments($params); unset($params);'."\n";
@@ -2704 +2720 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= $this->core->callBehavior("templatePrepareParams","Pings",$attr,$content);
+          $res .= $this->core->callBehavior("templatePrepareParams", 
+               array("tag" => "Pings","method" => "blog::getComments"), 
+               $attr,$content);
           $res .= '$_ctx->pings = $core->blog->getComments($params); unset($params);'."\n";
           $res .= "if (\$_ctx->posts !== null) { \$core->blog->withoutPassword(true);}\n";