Changeset 2496 for branches/release-39/php/lib/block.mtentries.php

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/php/lib/block.mtentries.php (modified) (1 diff)

branches/release-39/php/lib/block.mtentries.php

@@ -17 +17 @@
         // break that context, clear the stashed entries so fetch_entries
         // can reselect.
-        if ($ctx->stash('entries') &&
-            (isset($args['category']) || isset($args['categories']) ||
-             isset($args['tag']) || isset($args['tags']) ||
-             isset($args['id']) ||
-             isset($args['author']) ||
+        $this_tag = strtolower($ctx->this_tag());
+        if (($this_tag == 'mtentries') || ($this_tag == 'mtpages')) {
+            if ($ctx->stash('entries') &&
+                (isset($args['category']) || isset($args['categories']) ||
+                 isset($args['tag']) || isset($args['tags']) ||
+                 isset($args['author']) ))
+                $ctx->__stash['entries'] = null;
+        }
+        if ($ctx->__stash['entries'] &&
+            (isset($args['id']) ||
              isset($args['recently_commented_on']) ||
              isset($args['include_subcategories']) ||