Changeset 2100

Show
Ignore:
Timestamp:
04/25/08 06:27:01 (22 months ago)
Author:
fumiakiy
Message:

Fixed SubCategories behavior when category filter is specified in dynamic publishing. BugId:60763

Location:
branches/release-36
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/release-36/php/lib/block.mtsubcategories.php

    r1231 r2100  
    2222        # 
    2323        # sort_method takes precedence 
    24         $sort_order = $args['sort_order'] or 'ascend'; 
     24        $sort_order = isset($args['sort_order']) ? $args['sort_order'] : 'ascend'; 
    2525        $sort_method = $args['sort_method']; 
    2626 
    … …  
    3434                require_once("MTUtil.php"); 
    3535                $current_cat = cat_path_to_category($args['category'], $blog_id); 
     36                if ( is_array( $current_cat ) ) 
     37                    $current_cat = $current_cat[0]; 
    3638            } 
    3739            if ($current_cat == NULL) { 

  • branches/release-36/t/35-tags.dat

    r1652 r2100  
    453453{ "r" : "1", "t" : "<mt:setvar name='foo' value='poge'><mt:if name='foo' eq='hoge'><mt:else>value is <mt:var name='foo'></mt:if>", "e" : "value is poge"}, #401 
    454454{ "r" : "1", "t" : "<mt:setvar name='foo' value='1'><mt:if name='bar'>true<mt:else>false</mt:if>", "e" : "false"}, #402 
    455 { "r" : "1", "t" : "<MTTags glue=',' sort_by='rank'><MTTagLabel> <MTTagRank></MTTags>", "e" : "verse 1,rain 2,anemones 4,grandpa 6,strolling 6"} #403 
     455{ "r" : "1", "t" : "<MTTags glue=',' sort_by='rank'><MTTagLabel> <MTTagRank></MTTags>", "e" : "verse 1,rain 2,anemones 4,grandpa 6,strolling 6"}, #403 
     456{ "r" : "1", "t" : "<MTSubCategories category='foo'><MTCategoryLabel></MTSubCategories>", "e" : "subfoo"}, #404 
     457{ "r" : "1", "t" : "<MTCategories sort_by='label' sort_order='ascend' show_empty='1'><MTCategoryLabel>'<MTSubCategories><MTCategoryLabel></MTSubCategories>'</MTCategories>", "e" : "bar''foo'subfoo'subfoo''"} #405 
    456458]