Changeset 1747

Timestamp:

04/03/08 08:56:40 (23 months ago)

Author:

takayama

Message:

Fixed BugId:70282
* Fixed for nested category based archive count issue.

Location:

branches/release-33

Files:

• lib/MT/Template/ContextHandlers.pm (modified) (1 diff)
• php/lib/archive_lib.php (modified) (2 diffs)
• php/lib/function.mtarchivecount.php (modified) (2 diffs)
• plugins/WidgetManager/default_widgets/current_category_monthly_archive_list.mtml (modified) (1 diff)

branches/release-33/lib/MT/Template/ContextHandlers.pm

@@ -6064 +6064 @@
 sub _hdlr_archive_count {
     my $ctx = $_[0];
-    if ($ctx->{inside_mt_categories}) {
+    my $at = $ctx->{current_archive_type} || $ctx->{archive_type};
+    my $archiver = MT->publisher->archiver($at);
+    if ($ctx->{inside_mt_categories} && !$archiver->date_based) {
         return _hdlr_category_count($ctx);
     } elsif (my $count = $ctx->stash('archive_count')) {

branches/release-33/php/lib/archive_lib.php

@@ -68 +68 @@
     function setup_args($ctx, &$args) { }
     function template_params(&$ctx) { }
+    function is_date_based() { return false; }
 }
 
@@ -145 +146 @@
 
     // Override Method
+  function is_date_based() { return true; }
+
     function archive_prev_next($args, $content, &$ctx, &$repeat, $tag, $at) {
         $localvars = array('current_timestamp', 'current_timestamp_end', 'entries');

branches/release-33/php/lib/function.mtarchivecount.php

@@ -7 +7 @@
 
 function smarty_function_mtarchivecount($args, &$ctx) {
-    if ($ctx->stash('inside_mt_categories')) {
+    $at = '';
+    $archiver = null;
+    if ($at = $ctx->stash('current_archive_type')) {
+        require_once("archive_lib.php");
+        global $_archivers;
+        $archiver = $_archivers[$at];
+    }
+    if ($ctx->stash('inside_mt_categories') && !$archiver->is_date_based()) {
         return $ctx->tag('MTCategoryCount', $args);
     } elseif ($count = $ctx->stash('archive_count')) {
@@ -16 +23 @@
         $eargs = array();
         $eargs['blog_id'] = $ctx->stash('blog_id');
-        if ($at = $ctx->stash('current_archive_type')) {
-            require_once("archive_lib.php");
+        if ($at) {
             $ts = $ctx->stash('current_timestamp');
             $tse = $ctx->stash('current_timestamp_end');
-            global $_archivers;
-            $archiver = $_archivers[$at];
             if (isset($archiver)) {
                 if ($ts && $tse) {

branches/release-33/plugins/WidgetManager/default_widgets/current_category_monthly_archive_list.mtml

@@ -7 +7 @@
         <ul class="widget-list">
         </mt:ArchiveListHeader>
-            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1] ([_2])" params="<$mt:ArchiveTitle$>%%<$mt:ArchiveCount$>"></a></li>
+            <li class="widget-list-item"><a href="<$mt:ArchiveLink$>"><__trans phrase="[_1]" params="<$mt:ArchiveTitle$>"></a></li>
         <mt:ArchiveListFooter>
         </ul>