[Smarttemplate-cvscommit] smarttemplate class.smarttemplate.php, 1.10, 1.11 class.smarttemplateparser.php, 1.14, 1.15

[EndelWar <end...@us...>]

Update of /cvsroot/smarttemplate/smarttemplate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22523

Modified Files:
	class.smarttemplate.php class.smarttemplateparser.php 
Log Message:
Added extension_dir as variable. Fixes bug #1527683

Index: class.smarttemplateparser.php
===================================================================
RCS file: /cvsroot/smarttemplate/smarttemplate/class.smarttemplateparser.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** class.smarttemplateparser.php	23 Aug 2006 20:03:28 -0000	1.14
--- class.smarttemplateparser.php	7 Oct 2006 09:21:16 -0000	1.15
***************
*** 37,40 ****
--- 37,47 ----
  
  		/**
+ 		* The extension directory
+ 		*
+ 		* @access private
+ 		*/
+ 		var $extensions_dir;
+ 
+ 		/**
  		* List of used SmartTemplate Extensions
  		*
***************
*** 232,236 ****
  					if (!isset($this->extension_tagged[$extension]))
  					{
! 						$header  .=  "include_once \"smarttemplate_extensions/smarttemplate_extension_$extension.php\";\n";
  						$this->extension_tagged[$extension]  =  true;
  					}
--- 239,243 ----
  					if (!isset($this->extension_tagged[$extension]))
  					{
! 						$header .= 'include_once "'.$this->extensions_dir."/smarttemplate_extension_$extension.php\";\n";
  						$this->extension_tagged[$extension]  =  true;
  					}

Index: class.smarttemplate.php
===================================================================
RCS file: /cvsroot/smarttemplate/smarttemplate/class.smarttemplate.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.smarttemplate.php	24 Aug 2006 16:14:28 -0000	1.10
--- class.smarttemplate.php	7 Oct 2006 09:21:15 -0000	1.11
***************
*** 41,44 ****
--- 41,51 ----
  
  		/**
+ 		* Directory where all extensions are stored
+ 		*
+ 		* @access public
+ 		*/
+ 		var $extensions_dir	= 'smarttemplate_extensions';
+ 
+ 		/**
  		* Directory where all templates are stored
  		* Can be overwritten by global configuration array $_CONFIG['template_dir']
***************
*** 300,303 ****
--- 307,311 ----
  						$this->parser->left_delimiter	=	$this->left_delimiter;
  						$this->parser->right_delimiter	=	$this->right_delimiter;
+ 						$this->parser->extensions_dir	=	$this->extensions_dir;
  
  						if (!$this->parser->compile($this->cpl_file))