[mxbb-commits] core/includes mx_functions_core.php, 1.97, 1.98 mx_functions_tools.php, 1.38, 1.39

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

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

Modified Files:
	mx_functions_core.php mx_functions_tools.php 
Log Message:
load_file update, to ensure we are using shared files.

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** mx_functions_core.php	13 Jul 2008 19:30:28 -0000	1.97
--- mx_functions_core.php	13 Jul 2008 21:28:12 -0000	1.98
***************
*** 174,180 ****
  	function load_file($file = '', $force_shared = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_backend;
  
! 		$path = $mx_backend->load_file($force_shared);
  
  		if (file_exists($path . $file.'.'.$phpEx))
--- 174,190 ----
  	function load_file($file = '', $force_shared = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
  
! 		//
! 		// Remember loaded files
! 		//
! 		if (in_array(($file . (is_string($force_shared) ? $force_shared : '')), $mx_page->loaded_files))
! 		{
! 			return;
! 		}
! 
! 		$mx_page->loaded_files[] = $file . (is_string($force_shared) ? $force_shared : '');
! 
! 		$path = mx_backend::load_file($force_shared);
  
  		if (file_exists($path . $file.'.'.$phpEx))
***************
*** 2891,2894 ****
--- 2901,2906 ----
  	var $last_updated_by = '';
  
+ 	var $loaded_files = array();
+ 
  
  	// ------------------------------

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** mx_functions_tools.php	13 Jul 2008 19:30:28 -0000	1.38
--- mx_functions_tools.php	13 Jul 2008 21:28:13 -0000	1.39
***************
*** 1625,1629 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_cache::load_file('functions_post');
  }
  
--- 1625,1629 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_cache::load_file('functions_post', 'phpbb2');
  }