[Phpbb-checkins] r9957 - /branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Aug 11 17:24:18 2009
New Revision: 9957

Log:
allow custom template path for email files

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 11 17:24:18 2009
***************
*** 173,179 ****
  	/**
  	* Set email template to use
  	*/
! 	function template($template_file, $template_lang = '')
  	{
  		global $config, $phpbb_root_path, $user;
  
--- 173,179 ----
  	/**
  	* Set email template to use
  	*/
! 	function template($template_file, $template_lang = '', $template_path = '')
  	{
  		global $config, $phpbb_root_path, $user;
  
***************
*** 193,200 ****
  			$this->tpl_msg[$template_lang . $template_file] = new template();
  			$tpl = &$this->tpl_msg[$template_lang . $template_file];
  
! 			$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
! 			$template_path .= $template_lang . '/email';
  
  			$tpl->set_custom_template($template_path, $template_lang . '_email');
  
--- 193,203 ----
  			$this->tpl_msg[$template_lang . $template_file] = new template();
  			$tpl = &$this->tpl_msg[$template_lang . $template_file];
  
! 			if (!$template_path)
! 			{
! 				$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
! 				$template_path .= $template_lang . '/email';
! 			}
  
  			$tpl->set_custom_template($template_path, $template_lang . '_email');