Changeset 2605 for lang/php

Show
Ignore:
Timestamp:
12/06/07 13:17:30 (6 years ago)
Author:
tasuku
Message:

r333@dhcp158 (orig r76): tasuku | 2007-09-17 03:25:49 +0900
muda na path wo hozonsinai


Files:
1 modified

Legend:

Unmodified
Added
Removed
  • lang/php/mumu/trunk/mumu.php

    r2604 r2605  
    280280  private $block_dict;     // nodelist�������ock̾ => MuBlockNode(�λ��� 
    281281  public $include_paths;   // include�����ե��������ʥ�����������ǻȤ���  public $path;            // ��ʬ�Υե����� 
    282   private $parent_path;    // extends�Υե����� 
    283282  private $parent_tfile;   // extends���������ƥƥ�졼��  function __construct($nodelist, $block_dict, $include_paths, 
    284283                       $path = null, $parent_path = null) { 
     
    288287    $this->path = $path; 
    289288    if ($parent_path && $path) { 
    290       if (($this->parent_path = MuUtil::getpath($path, $parent_path)) === false 
    291           || ($this->parent_tfile = MuParser::parse_from_file($this->parent_path)) === false) { 
     289      if (($epath = MuUtil::getpath($path, $parent_path)) === false 
     290          || ($this->parent_tfile = MuParser::parse_from_file($epath)) === false) { 
    292291        throw new MuParserException('invalid filename specified on extends'); 
    293292      } 
     
    339338      } 
    340339    } 
    341     if (isset($this->parent_path)) { 
    342       if ($cache_mtime < filemtime($this->parent_path)) { 
     340    if (isset($this->parent_tfile)) { 
     341      if ($cache_mtime < filemtime($this->parent_tfile->path)) { 
    343342        return false; 
    344343      } 
     
    14191418      } 
    14201419    } 
     1420    // ���������ʤ��ä���� 
    14211421    if (!isset($mf)) { 
    14221422      if (($t = file_get_contents($template_path)) === false) { 
     
    14311431      } 
    14321432      $mf = new MuFile($nl, $p->block_dict, $p->include_paths, $template_path, $p->extends); 
     1433      // ��ꤷ�����������¸ 
    14331434      if (isset($sfpath)) { 
    14341435        MuUtil::serialize_to_file($mf, $sfpath);