cvs: smarty / NEWS /libs Smarty.class.php Smarty_Compiler.class.php /libs/core core.load_plugins.php core.load_resource_plugin.php /libs/plugins function.html_checkboxes.php function.html_image.php function.html_options.php function.html_radios.php function.html_select_date.php function.html_select_time.php modifier.date_format.php

http://cvs.php.net/diff.php/smarty/NEWS?r1=1.463&r2=1.464&ty=u
Index: smarty/NEWS
diff -u smarty/NEWS:1.463 smarty/NEWS:1.464
--- smarty/NEWS:1.463	Mon Jul 12 11:22:56 2004
+++ smarty/NEWS	Fri Jul 23 11:34:52 2004
@@ -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
http://cvs.php.net/diff.php/smarty/libs/Smarty.class.php?r1=1.495&r2=1.496&ty=u
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.495 smarty/libs/Smarty.class.php:1.496
--- smarty/libs/Smarty.class.php:1.495	Wed Jul 14 17:31:29 2004
+++ smarty/libs/Smarty.class.php	Fri Jul 23 11:34:52 2004
@@ -30,7 +30,7 @@
  * @version 2.6.4-dev
  */
 
-/* $Id: Smarty.class.php,v 1.495 2004/07/14 21:31:29 mohrt Exp $ */
+/* $Id: Smarty.class.php,v 1.496 2004/07/23 15:34:52 messju Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -1309,7 +1309,7 @@
      */
     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,20 +1352,11 @@
      * @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);
     }
 
    /**
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.327&r2=1.328&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.327 smarty/libs/Smarty_Compiler.class.php:1.328
--- smarty/libs/Smarty_Compiler.class.php:1.327	Tue Jul 20 07:51:05 2004
+++ smarty/libs/Smarty_Compiler.class.php	Fri Jul 23 11:34:52 2004
@@ -26,7 +26,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.327 2004/07/20 11:51:05 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.328 2004/07/23 15:34:52 messju Exp $ */
 
 /**
  * Template compiling class
@@ -590,7 +590,7 @@
          * 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 @@
          * 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 @@
          * 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 @@
             }
 
             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__);
http://cvs.php.net/diff.php/smarty/libs/core/core.load_plugins.php?r1=1.8&r2=1.9&ty=u
Index: smarty/libs/core/core.load_plugins.php
diff -u smarty/libs/core/core.load_plugins.php:1.8 smarty/libs/core/core.load_plugins.php:1.9
--- smarty/libs/core/core.load_plugins.php:1.8	Mon Jul 12 11:22:57 2004
+++ smarty/libs/core/core.load_plugins.php	Fri Jul 23 11:34:52 2004
@@ -54,7 +54,7 @@
             }
         }
 
-        $_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";
http://cvs.php.net/diff.php/smarty/libs/core/core.load_resource_plugin.php?r1=1.6&r2=1.7&ty=u
Index: smarty/libs/core/core.load_resource_plugin.php
diff -u smarty/libs/core/core.load_resource_plugin.php:1.6 smarty/libs/core/core.load_resource_plugin.php:1.7
--- smarty/libs/core/core.load_resource_plugin.php:1.6	Mon Jul 12 11:22:57 2004
+++ smarty/libs/core/core.load_resource_plugin.php	Fri Jul 23 11:34:52 2004
@@ -41,7 +41,7 @@
         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) {            /*
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_checkboxes.php?r1=1.15&r2=1.16&ty=u
Index: smarty/libs/plugins/function.html_checkboxes.php
diff -u smarty/libs/plugins/function.html_checkboxes.php:1.15 smarty/libs/plugins/function.html_checkboxes.php:1.16
--- smarty/libs/plugins/function.html_checkboxes.php:1.15	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_checkboxes.php	Fri Jul 23 11:34:52 2004
@@ -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;
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_image.php?r1=1.27&r2=1.28&ty=u
Index: smarty/libs/plugins/function.html_image.php
diff -u smarty/libs/plugins/function.html_image.php:1.27 smarty/libs/plugins/function.html_image.php:1.28
--- smarty/libs/plugins/function.html_image.php:1.27	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_image.php	Fri Jul 23 11:34:52 2004
@@ -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 = '';
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_options.php?r1=1.22&r2=1.23&ty=u
Index: smarty/libs/plugins/function.html_options.php
diff -u smarty/libs/plugins/function.html_options.php:1.22 smarty/libs/plugins/function.html_options.php:1.23
--- smarty/libs/plugins/function.html_options.php:1.22	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_options.php	Fri Jul 23 11:34:53 2004
@@ -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;
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_radios.php?r1=1.18&r2=1.19&ty=u
Index: smarty/libs/plugins/function.html_radios.php
diff -u smarty/libs/plugins/function.html_radios.php:1.18 smarty/libs/plugins/function.html_radios.php:1.19
--- smarty/libs/plugins/function.html_radios.php:1.18	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_radios.php	Fri Jul 23 11:34:53 2004
@@ -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;
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_select_date.php?r1=1.24&r2=1.25&ty=u
Index: smarty/libs/plugins/function.html_select_date.php
diff -u smarty/libs/plugins/function.html_select_date.php:1.24 smarty/libs/plugins/function.html_select_date.php:1.25
--- smarty/libs/plugins/function.html_select_date.php:1.24	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_select_date.php	Fri Jul 23 11:34:53 2004
@@ -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");
http://cvs.php.net/diff.php/smarty/libs/plugins/function.html_select_time.php?r1=1.12&r2=1.13&ty=u
Index: smarty/libs/plugins/function.html_select_time.php
diff -u smarty/libs/plugins/function.html_select_time.php:1.12 smarty/libs/plugins/function.html_select_time.php:1.13
--- smarty/libs/plugins/function.html_select_time.php:1.12	Mon Jul 12 11:24:43 2004
+++ smarty/libs/plugins/function.html_select_time.php	Fri Jul 23 11:34:53 2004
@@ -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();
http://cvs.php.net/diff.php/smarty/libs/plugins/modifier.date_format.php?r1=1.12&r2=1.13&ty=u
Index: smarty/libs/plugins/modifier.date_format.php
diff -u smarty/libs/plugins/modifier.date_format.php:1.12 smarty/libs/plugins/modifier.date_format.php:1.13
--- smarty/libs/plugins/modifier.date_format.php:1.12	Mon Jul 12 11:27:00 2004
+++ smarty/libs/plugins/modifier.date_format.php	Fri Jul 23 11:34:53 2004
@@ -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
  *