Index: branches/release-41/lib/MT/ArchiveType/Category.pm
===================================================================
--- branches/release-41/lib/MT/ArchiveType/Category.pm (revision 2335)
+++ branches/release-41/lib/MT/ArchiveType/Category.pm (revision 2737)
@@ -143,7 +143,7 @@
 sub archive_entries_count {
     my $obj = shift;
-    my ( $blog, $at, $entry ) = @_;
+    my ( $blog, $at, $entry, $cat ) = @_;
     return $obj->SUPER::archive_entries_count(@_) unless $entry;
-    my $cat = $entry->category;
+    $cat = $entry->category unless $cat;
     return 0 unless $cat;
     return $obj->SUPER::archive_entries_count(
Index: branches/release-41/lib/MT/ArchiveType/CategoryMonthly.pm
===================================================================
--- branches/release-41/lib/MT/ArchiveType/CategoryMonthly.pm (revision 2500)
+++ branches/release-41/lib/MT/ArchiveType/CategoryMonthly.pm (revision 2737)
@@ -202,6 +202,6 @@
 sub archive_entries_count {
     my $obj = shift;
-    my ( $blog, $at, $entry ) = @_;
-    my $cat = $entry->category;
+    my ( $blog, $at, $entry, $cat ) = @_;
+    $cat = $entry->category unless $cat;
     return 0 unless $cat;
     return $obj->SUPER::archive_entries_count(
Index: branches/release-41/lib/MT/ArchiveType/CategoryWeekly.pm
===================================================================
--- branches/release-41/lib/MT/ArchiveType/CategoryWeekly.pm (revision 2500)
+++ branches/release-41/lib/MT/ArchiveType/CategoryWeekly.pm (revision 2737)
@@ -198,6 +198,6 @@
 sub archive_entries_count {
     my $obj = shift;
-    my ( $blog, $at, $entry ) = @_;
-    my $cat = $entry->category;
+    my ( $blog, $at, $entry, $cat ) = @_;
+    $cat = $entry->category unless $cat;
     return 0 unless $cat;
     return $obj->SUPER::archive_entries_count(
Index: branches/release-41/lib/MT/ArchiveType/CategoryDaily.pm
===================================================================
--- branches/release-41/lib/MT/ArchiveType/CategoryDaily.pm (revision 2500)
+++ branches/release-41/lib/MT/ArchiveType/CategoryDaily.pm (revision 2737)
@@ -207,6 +207,6 @@
 sub archive_entries_count {
     my $obj = shift;
-    my ( $blog, $at, $entry ) = @_;
-    my $cat = $entry->category;
+    my ( $blog, $at, $entry, $cat ) = @_;
+    $cat = $entry->category unless $cat;
     return 0 unless $cat;
     return $obj->SUPER::archive_entries_count(
Index: branches/release-41/lib/MT/ArchiveType/CategoryYearly.pm
===================================================================
--- branches/release-41/lib/MT/ArchiveType/CategoryYearly.pm (revision 2500)
+++ branches/release-41/lib/MT/ArchiveType/CategoryYearly.pm (revision 2737)
@@ -187,6 +187,6 @@
 sub archive_entries_count {
     my $obj = shift;
-    my ( $blog, $at, $entry ) = @_;
-    my $cat = $entry->category;
+    my ( $blog, $at, $entry, $cat ) = @_;
+    $cat = $entry->category unless $cat;
     return 0 unless $cat;
     return $obj->SUPER::archive_entries_count(