[mxbb-commits] core/includes mx_functions_core.php, 1.79, 1.80 mx_functions_style.php, 1.44, 1.45

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8430

Modified Files:
	mx_functions_core.php mx_functions_style.php 
Log Message:
Default phpBB2 template file was bad
- " -> ' in some lang files 
BUGFIX: Number of db queries stats
Cache folder was not emptied (installation)

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** mx_functions_core.php	13 Feb 2008 22:16:21 -0000	1.79
--- mx_functions_core.php	14 Feb 2008 21:33:36 -0000	1.80
***************
*** 664,670 ****
  		while (($entry = readdir($dir)) !== false)
  		{
! 			if ($type = 'all')
  			{
- 				//if (preg_match('/^(tpl2_|tpl_|sql_|_block_|_page_|data_(?!global))/', $entry)) // Cannot remove tpl cache files currently in use ;)
  				if (preg_match('/^(sql_|_block_|_page_|data_(?!global))/', $entry))
  				{
--- 664,669 ----
  		while (($entry = readdir($dir)) !== false)
  		{
! 			if ($type == 'all')
  			{
  				if (preg_match('/^(sql_|_block_|_page_|data_(?!global))/', $entry))
  				{
***************
*** 672,676 ****
  				}
  			}
! 			else if ($type = 'blocks')
  			{
  				if (preg_match('/^(_block_)/', $entry))
--- 671,675 ----
  				}
  			}
! 			else if ($type == 'blocks')
  			{
  				if (preg_match('/^(_block_)/', $entry))
***************
*** 680,684 ****
  
  			}
! 			else if ($type = 'pages')
  			{
  				if (preg_match('/^(_page_|_pagemap_)/', $entry))
--- 679,683 ----
  
  			}
! 			else if ($type == 'pages')
  			{
  				if (preg_match('/^(_page_|_pagemap_)/', $entry))
***************
*** 688,692 ****
  
  			}
! 			if ($type = 'install')
  			{
  				if (preg_match('/^(tpl2_|tpl_|_block_|_page_|data_(?!global))/', $entry)) // Cannot remove tpl cache files currently in use ;)
--- 687,691 ----
  
  			}
! 			else if ($type == 'install')
  			{
  				if (preg_match('/^(tpl2_|tpl_|_block_|_page_|data_(?!global))/', $entry)) // Cannot remove tpl cache files currently in use ;)

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** mx_functions_style.php	12 Feb 2008 13:12:04 -0000	1.44
--- mx_functions_style.php	14 Feb 2008 21:33:36 -0000	1.45
***************
*** 340,343 ****
--- 340,350 ----
  						$filename = $phpbb_root_path . 'templates/' . $mx_user->cloned_template_name . '/' . $filename;
  					}
+ 					else if( file_exists($phpbb_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename) && !empty($mx_user->default_template_name))
+ 					{
+ 						//
+ 						// Then check Default
+ 						//
+ 						$filename = $phpbb_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename;
+ 					}
  					else if( file_exists($phpbb_root_path . $this->root . '/' . $filename) )
  					{
***************
*** 1250,1254 ****
  	{
  		global $lang, $board_config, $mx_block, $phpEx, $mx_root_path;
! 		
  		$default_lang = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : $board_config['default_lang'];
  
--- 1257,1261 ----
  	{
  		global $lang, $board_config, $mx_block, $phpEx, $mx_root_path;
! 
  		$default_lang = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : $board_config['default_lang'];