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

backed out renaming of _get_plugin_filepath() to get_plugin_filepath()

Browse Source 
we'll stick to _get_plugin_filepath() and look for a more viable
solution to be exposed to plugin-writers.
This commit is contained in:
messju
2004-07-23 15:34:53 +00:00
parent aa016f3ded
commit c9844d410b
12 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -1,6 +1,3 @@
- rename "private" Smarty::_get_plugin_filepath() to public
Smarty:: get_plugin_filepath() . _get_plugin_filepath() is kept as
a wrapper for backward compatibility (messju)
- remove touch() call that made the compiled-template's timestamp the
same as the source-template's one. (messju)
- add assign attribute to html_checkboxes and html_radios

13
libs/Smarty.class.php
View File

@@ -1309,7 +1309,7 @@ class Smarty
*/
function config_load($file, $section = null, $scope = 'global')
{
require_once($this->get_plugin_filepath('function', 'config_load'));
require_once($this->_get_plugin_filepath('function', 'config_load'));
smarty_function_config_load(array('file' => $file, 'section' => $section, 'scope' => $scope), $this);
}
@@ -1352,22 +1352,13 @@ class Smarty
* @param string $name
* @return string|false
*/
function get_plugin_filepath($type, $name)
function _get_plugin_filepath($type, $name)
{
$_params = array('type' => $type, 'name' => $name);
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.assemble_plugin_filepath.php');
return smarty_core_assemble_plugin_filepath($_params, $this);
}
/**
* wrapper (kept for compatibility)
*
*/
function _get_plugin_filepath($type, $name)
{
return $this->get_plugin_filepath($type, $name);
}
/**
* test if resource needs compiling
*

8
libs/Smarty_Compiler.class.php
View File

@@ -590,7 +590,7 @@ class Smarty_Compiler extends Smarty {
* Otherwise we need to load plugin file and look for the function
* inside it.
*/
else if ($plugin_file = $this->get_plugin_filepath('compiler', $tag_command)) {
else if ($plugin_file = $this->_get_plugin_filepath('compiler', $tag_command)) {
$found = true;
include_once $plugin_file;
@@ -665,7 +665,7 @@ class Smarty_Compiler extends Smarty {
* Otherwise we need to load plugin file and look for the function
* inside it.
*/
else if ($plugin_file = $this->get_plugin_filepath('block', $tag_command)) {
else if ($plugin_file = $this->_get_plugin_filepath('block', $tag_command)) {
$found = true;
include_once $plugin_file;
@@ -749,7 +749,7 @@ class Smarty_Compiler extends Smarty {
* Otherwise we need to load plugin file and look for the function
* inside it.
*/
else if ($plugin_file = $this->get_plugin_filepath('function', $tag_command)) {
else if ($plugin_file = $this->_get_plugin_filepath('function', $tag_command)) {
$found = true;
include_once $plugin_file;
@@ -1894,7 +1894,7 @@ class Smarty_Compiler extends Smarty {
}
if (empty($this->_plugins['modifier'][$_modifier_name])
&& !$this->get_plugin_filepath('modifier', $_modifier_name)
&& !$this->_get_plugin_filepath('modifier', $_modifier_name)
&& function_exists($_modifier_name)) {
if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
$this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);

2
libs/core/core.load_plugins.php
View File

@@ -54,7 +54,7 @@ function smarty_core_load_plugins($params, &$smarty)
}
}
$_plugin_file = $smarty->get_plugin_filepath($_type, $_name);
$_plugin_file = $smarty->_get_plugin_filepath($_type, $_name);
if (! $_found = ($_plugin_file != false)) {
$_message = "could not load plugin file '$_type.$_name.php'\n";

2
libs/core/core.load_resource_plugin.php
View File

@@ -41,7 +41,7 @@ function smarty_core_load_resource_plugin($params, &$smarty)
return;
}
$_plugin_file = $smarty->get_plugin_filepath('resource', $params['type']);
$_plugin_file = $smarty->_get_plugin_filepath('resource', $params['type']);
$_found = ($_plugin_file != false);
if ($_found) { /*

2
libs/plugins/function.html_checkboxes.php
View File

@@ -40,7 +40,7 @@
*/
function smarty_function_html_checkboxes($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','escape_special_chars');
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
$name = 'checkbox';
$values = null;

2
libs/plugins/function.html_image.php
View File

@@ -36,7 +36,7 @@
*/
function smarty_function_html_image($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','escape_special_chars');
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
$alt = '';
$file = '';

2
libs/plugins/function.html_options.php
View File

@@ -28,7 +28,7 @@
*/
function smarty_function_html_options($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','escape_special_chars');
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
$name = null;
$values = null;

2
libs/plugins/function.html_radios.php
View File

@@ -40,7 +40,7 @@
*/
function smarty_function_html_radios($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','escape_special_chars');
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
$name = 'radio';
$values = null;

4
libs/plugins/function.html_select_date.php
View File

@@ -32,8 +32,8 @@
*/
function smarty_function_html_select_date($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','make_timestamp');
require_once $smarty->get_plugin_filepath('function','html_options');
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
require_once $smarty->_get_plugin_filepath('function','html_options');
/* Default values. */
$prefix = "Date_";
$start_year = strftime("%Y");

4
libs/plugins/function.html_select_time.php
View File

@@ -21,8 +21,8 @@
*/
function smarty_function_html_select_time($params, &$smarty)
{
require_once $smarty->get_plugin_filepath('shared','make_timestamp');
require_once $smarty->get_plugin_filepath('function','html_options');
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
require_once $smarty->_get_plugin_filepath('function','html_options');
/* Default values. */
$prefix = "Time_";
$time = time();

2
libs/plugins/modifier.date_format.php
View File

@@ -8,7 +8,7 @@
/**
* Include the {@link shared.make_timestamp.php} plugin
*/
require_once $smarty->get_plugin_filepath('shared','make_timestamp');
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
/**
* Smarty date_format modifier plugin
*