smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 11:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

update file: parsing

Browse Source
This commit is contained in:
mohrt
2001-04-12 19:56:38 +00:00
parent 53b6910340
commit f5c945f7cc
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Smarty.class.php
View File

@@ -492,9 +492,9 @@ class Smarty
$tpl_path_parts = preg_split("/:/",$tpl_path,2); $tpl_path_parts = preg_split("/:/",$tpl_path,2);
if(count($tpl_path_parts) == 1) { if(count($tpl_path_parts) == 1) {
// no resource type, treat as flat file from template_dir // no resource type, treat as type "file"
$resource_type = "file"; $resource_type = "file";
$filename = $this->template_dir.'/'.$tpl_path_parts[0]; $filename = $tpl_path_parts[0];
} else { } else {
$resource_type = $tpl_path_parts[0]; $resource_type = $tpl_path_parts[0];
$filename = $tpl_path_parts[1]; $filename = $tpl_path_parts[1];
@@ -502,12 +502,16 @@ class Smarty
switch($resource_type) { switch($resource_type) {
case "file": case "file":
if(substr($filename,0,1) != "/") {
// relative pathname to $template_dir
$filename = $this->template_dir.'/'.$filename;
}
if (file_exists($filename)) { if (file_exists($filename)) {
$template_source = $this->_read_file($filename); $template_source = $this->_read_file($filename);
$template_timestamp = filemtime($filename); $template_timestamp = filemtime($filename);
return true; return true;
} else { } else {
$this->_set_error_msg("unable to read template resource: \"$filename.\""); $this->_set_error_msg("unable to read template resource: \"$tpl_path.\"");
$this->_trigger_error_msg(); $this->_trigger_error_msg();
return false; return false;
} }

10
libs/Smarty.class.php
View File

@@ -492,9 +492,9 @@ class Smarty
$tpl_path_parts = preg_split("/:/",$tpl_path,2); $tpl_path_parts = preg_split("/:/",$tpl_path,2);
if(count($tpl_path_parts) == 1) { if(count($tpl_path_parts) == 1) {
// no resource type, treat as flat file from template_dir // no resource type, treat as type "file"
$resource_type = "file"; $resource_type = "file";
$filename = $this->template_dir.'/'.$tpl_path_parts[0]; $filename = $tpl_path_parts[0];
} else { } else {
$resource_type = $tpl_path_parts[0]; $resource_type = $tpl_path_parts[0];
$filename = $tpl_path_parts[1]; $filename = $tpl_path_parts[1];
@@ -502,12 +502,16 @@ class Smarty
switch($resource_type) { switch($resource_type) {
case "file": case "file":
if(substr($filename,0,1) != "/") {
// relative pathname to $template_dir
$filename = $this->template_dir.'/'.$filename;
}
if (file_exists($filename)) { if (file_exists($filename)) {
$template_source = $this->_read_file($filename); $template_source = $this->_read_file($filename);
$template_timestamp = filemtime($filename); $template_timestamp = filemtime($filename);
return true; return true;
} else { } else {
$this->_set_error_msg("unable to read template resource: \"$filename.\""); $this->_set_error_msg("unable to read template resource: \"$tpl_path.\"");
$this->_trigger_error_msg(); $this->_trigger_error_msg();
return false; return false;
} }