smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2026-05-04 11:44:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

started moving from $this to $smarty in core.*.php

Browse Source
This commit is contained in:
messju
2003-06-22 03:13:25 +00:00
parent b0562c1dce
commit 81bf74f327
22 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/core/core.parse_resource_name.php
+8 -8
View File
@@ -17,7 +17,7 @@
// $resource_base_path, $resource_name, &$resource_type, &$resource_name
function smarty_core_parse_resource_name(&$params, &$this)
function smarty_core_parse_resource_name(&$params, &$smarty)
{
// split tpl_path by the first colon
@@ -25,12 +25,12 @@ function smarty_core_parse_resource_name(&$params, &$this)
if (count($_resource_name_parts) == 1) {
// no resource type given
$params['resource_type'] = $this->default_resource_type;
$params['resource_type'] = $smarty->default_resource_type;
$params['resource_name'] = $_resource_name_parts[0];
} else {
if(strlen($_resource_name_parts[0]) == 1) {
// 1 char is not resource type, but part of filepath
$params['resource_type'] = $this->default_resource_type;
$params['resource_type'] = $smarty->default_resource_type;
$params['resource_name'] = $params['resource_name'];
} else {
$params['resource_type'] = $_resource_name_parts[0];
@@ -42,7 +42,7 @@ function smarty_core_parse_resource_name(&$params, &$this)
if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $params['resource_name'])) {
// relative pathname to $params['resource_base_path']
// use the first directory where the file is found
$_resource_base_path = isset($params['resource_base_path']) ? $params['resource_base_path'] : array($this->template_dir, '.');
$_resource_base_path = isset($params['resource_base_path']) ? $params['resource_base_path'] : array($smarty->template_dir, '.');
settype($_resource_base_path, 'array');
foreach ($_resource_base_path as $_curr_path) {
$_fullpath = $_curr_path . DIRECTORY_SEPARATOR . $params['resource_name'];
@@ -51,10 +51,10 @@ function smarty_core_parse_resource_name(&$params, &$this)
return true;
}
// didn't find the file, try include_path
$_params = array('resource_name' => $_fullpath);
$_params = array('file_path' => $_fullpath);
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php');
if(smarty_core_get_include_path($_params, $this)) {
$params['resource_name'] = $_params['new_resource_name'];
if(smarty_core_get_include_path($_params, $smarty)) {
$params['resource_name'] = $_params['new_file_path'];
return true;
}
}
@@ -63,7 +63,7 @@ function smarty_core_parse_resource_name(&$params, &$this)
} else {
$_params = array('type' => $params['resource_type']);
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_resource_plugin.php');
smarty_core_load_resource_plugin($_params, $this);
smarty_core_load_resource_plugin($_params, $smarty);
}
return true;