Changeset 2496 for branches/release-39/lib/MT/Template/ContextHandlers.pm

Timestamp:

06/03/08 22:02:56 (18 months ago)

Author:

bchoate

Message:

Fix to permit plugins that prepopulate the entries stash to call the entries handler allowing for further filtering using category/tag/author attributes. BugId:80022

Files:

• branches/release-39/lib/MT/Template/ContextHandlers.pm (modified) (1 diff)

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

@@ -7538 +7538 @@
         $entries = undef if $entry->class ne $class_type;
 
-        foreach my $args_key ('category', 'categories', 'tag', 'tags', 'author', 'id', 'days', 'recently_commented_on', 'include_subcategories', 'include_blogs', 'exclude_blogs', 'blog_ids') {
-            if (exists($args->{$args_key})) {
-                $entries = undef;
-                last;
+        # For the stock Entries/Pages tags, clear any prepopulated
+        # entries list (placed by archive publishing) if we're invoked
+        # with any of the following attributes. A plugin tag may
+        # prepopulate the entries stash and then invoke this handler
+        # to permit further filtering of the entries.
+        my $tag = lc $ctx->stash('tag');
+        if ($entries && (($tag eq 'entries') || ($tag eq 'pages'))) {
+            foreach my $args_key ('category', 'categories', 'tag', 'tags',
+                'author') {
+                if (exists($args->{$args_key})) {
+                    $entries = undef;
+                    last;
+                }
+            }
+        }
+        if ( $entries ) {
+            foreach my $args_key ('id', 'days', 'recently_commented_on',
+                'include_subcategories', 'include_blogs', 'exclude_blogs',
+                'blog_ids') {
+                if (exists($args->{$args_key})) {
+                    $entries = undef;
+                    last;
+                }
             }
         }