Changeset 1335

Show
Ignore:
Timestamp:
01/23/08 09:47:33 (6 months ago)
Author:
takayama
Message:

Fixed BugId:66853
* Never use category filter when category class was not folder.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-29/php/lib/block.mtentries.php

    r1308 r1335  
    6161            $archiver->setup_args($ctx, $args); 
    6262        } 
    63         if (($cat = $ctx->stash('category')) && ($args['class'] == 'entry' || $args['class'] == 'page')) { 
     63        $cat = $ctx->stash('category'); 
     64        if (isset($cat) && (($args['class'] == 'entry' && $cat['category_class'] == 'category') || ($args['class'] == 'page' && $cat['category_class'] == 'folder'))) { 
    6465            $args['category'] or $args['categories'] or $args['category_id'] = $cat['category_id']; 
    6566            if ($ctx->stash('inside_mt_categories')) { 

  • branches/release-29/php/lib/block.mtpages.php

    r1174 r1335  
    3737    $localvars = array('current_timestamp', 'current_timestamp_end', 'current_archive_type'); 
    3838    $ctx->localize($localvars); 
     39    foreach ($localvars as $localvar) { 
     40        $ctx->__stash[$localvar] = null; 
     41    } 
    3942 
    4043    $out = smarty_block_mtentries($args, $content, $ctx, $repeat);