Show
Ignore:
Timestamp:
10/03/08 01:07:01 (14 months ago)
Author:
bchoate
Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/php/lib/modifier.setvar.php

    r1174 r3082  
    99    global $mt; 
    1010    $ctx =& $mt->context(); 
    11     $vars =& $ctx->__stash['vars']; 
     11    if (array_key_exists('__inside_set_hashvar', $ctx->__stash)) { 
     12        $vars =& $ctx->__stash['__inside_set_hashvar']; 
     13    } else { 
     14        $vars =& $ctx->__stash['vars']; 
     15    } 
    1216    $vars[$name] = $text; 
    1317    return ''; 
    1418} 
    15 ?>