Index: /branches/release-29/php/lib/block.mtentries.php
===================================================================
--- /branches/release-29/php/lib/block.mtentries.php (revision 1308)
+++ /branches/release-29/php/lib/block.mtentries.php (revision 1335)
@@ -61,5 +61,6 @@
             $archiver->setup_args($ctx, $args);
         }
-        if (($cat = $ctx->stash('category')) && ($args['class'] == 'entry' || $args['class'] == 'page')) {
+        $cat = $ctx->stash('category');
+        if (isset($cat) && (($args['class'] == 'entry' && $cat['category_class'] == 'category') || ($args['class'] == 'page' && $cat['category_class'] == 'folder'))) {
             $args['category'] or $args['categories'] or $args['category_id'] = $cat['category_id'];
             if ($ctx->stash('inside_mt_categories')) {
Index: /branches/release-29/php/lib/block.mtpages.php
===================================================================
--- /branches/release-29/php/lib/block.mtpages.php (revision 1174)
+++ /branches/release-29/php/lib/block.mtpages.php (revision 1335)
@@ -37,4 +37,7 @@
     $localvars = array('current_timestamp', 'current_timestamp_end', 'current_archive_type');
     $ctx->localize($localvars);
+    foreach ($localvars as $localvar) {
+        $ctx->__stash[$localvar] = null;
+    }
 
     $out = smarty_block_mtentries($args, $content, $ctx, $repeat);