[mxbb-commits] core/includes/shared/phpbb2/includes emailer.php, 1.4, 1.5

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8749/includes/shared/phpbb2/includes

Modified Files:
	emailer.php 
Log Message:
mx emailer

Index: emailer.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/emailer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** emailer.php	6 Oct 2008 01:03:57 -0000	1.4
--- emailer.php	7 Oct 2008 00:10:14 -0000	1.5
***************
*** 110,114 ****
  	function use_template($template_file, $template_lang = '')
  	{
! 		global $board_config, $phpbb_root_path, $module_root_path, $mx_root_path;
  
  		if (trim($template_file) == '')
--- 110,114 ----
  	function use_template($template_file, $template_lang = '')
  	{
! 		global $board_config, $phpbb_root_path, $mx_root_path, $mx_root_path;
  
  		if (trim($template_file) == '')
***************
*** 124,132 ****
  		if (empty($this->tpl_msg[$template_lang . $template_file]))
  		{
! 			$tpl_file = $module_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';
  
  			if (!file_exists(realpath($tpl_file)))
  			{
! 				$tpl_file = $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl';
  
  				if (!file_exists(realpath($tpl_file)))
--- 124,132 ----
  		if (empty($this->tpl_msg[$template_lang . $template_file]))
  		{
! 			$tpl_file = $mx_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl';
  
  			if (!file_exists(realpath($tpl_file)))
  			{
! 				$tpl_file = $mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl';
  
  				if (!file_exists(realpath($tpl_file)))
***************
*** 159,163 ****
  	function send()
  	{
! 		global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $module_root_path;
  
      	// Escape all quotes, else the eval will fail.
--- 159,163 ----
  	function send()
  	{
! 		global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $mx_root_path;
  
      	// Escape all quotes, else the eval will fail.