cvs: smarty / NEWS /libs Smarty.class.php Smarty_Compiler.class.php /libs/core core.load_plugins.php core.load_resource_plugin.php

messju		Mon Jul 12 11:22:57 2004 EDT

  Modified files:              
    /smarty	NEWS 
    /smarty/libs	Smarty.class.php Smarty_Compiler.class.php 
    /smarty/libs/core	core.load_plugins.php 
                     	core.load_resource_plugin.php 
  Log:
  renamed Smarty::_get_plugin_filepath() to Smarty::get_plugin_filepath()
  
  
  
http://cvs.php.net/diff.php/smarty/NEWS?r1=1.462&r2=1.463&ty=u
Index: smarty/NEWS
diff -u smarty/NEWS:1.462 smarty/NEWS:1.463
--- smarty/NEWS:1.462	Mon Jul 12 11:05:30 2004
+++ smarty/NEWS	Mon Jul 12 11:22:56 2004
@@ -1,3 +1,6 @@
+  - 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.493&r2=1.494&ty=u
Index: smarty/libs/Smarty.class.php
diff -u smarty/libs/Smarty.class.php:1.493 smarty/libs/Smarty.class.php:1.494
--- smarty/libs/Smarty.class.php:1.493	Mon Jul 12 11:05:30 2004
+++ smarty/libs/Smarty.class.php	Mon Jul 12 11:22:56 2004
@@ -30,7 +30,7 @@
  * @version 2.6.4-dev
  */
 
-/* $Id: Smarty.class.php,v 1.493 2004/07/12 15:05:30 messju Exp $ */
+/* $Id: Smarty.class.php,v 1.494 2004/07/12 15:22:56 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,11 +1352,20 @@
      * @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.325&r2=1.326&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.325 smarty/libs/Smarty_Compiler.class.php:1.326
--- smarty/libs/Smarty_Compiler.class.php:1.325	Thu Jul  1 11:39:34 2004
+++ smarty/libs/Smarty_Compiler.class.php	Mon Jul 12 11:22:56 2004
@@ -26,7 +26,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.325 2004/07/01 15:39:34 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.326 2004/07/12 15:22:56 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.7&r2=1.8&ty=u
Index: smarty/libs/core/core.load_plugins.php
diff -u smarty/libs/core/core.load_plugins.php:1.7 smarty/libs/core/core.load_plugins.php:1.8
--- smarty/libs/core/core.load_plugins.php:1.7	Sat Oct 11 04:55:53 2003
+++ smarty/libs/core/core.load_plugins.php	Mon Jul 12 11:22:57 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.5&r2=1.6&ty=u
Index: smarty/libs/core/core.load_resource_plugin.php
diff -u smarty/libs/core/core.load_resource_plugin.php:1.5 smarty/libs/core/core.load_resource_plugin.php:1.6
--- smarty/libs/core/core.load_resource_plugin.php:1.5	Sat Oct 11 04:55:53 2003
+++ smarty/libs/core/core.load_resource_plugin.php	Mon Jul 12 11:22:57 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) {            /*

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php