[mxbb-commits] core/includes mx_functions_style.php,1.98,1.99

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
fix to load phpBB3 images in images var

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** mx_functions_style.php	5 Oct 2008 01:16:26 -0000	1.98
--- mx_functions_style.php	5 Oct 2008 23:10:24 -0000	1.99
***************
*** 1021,1030 ****
  
  		//
- 		// Load images
- 		//
- 		$this->_load_phpbb_images();
- 		$this->_load_mxbb_images();
- 
- 		//
  		// What template to use?
  		//
--- 1021,1024 ----
***************
*** 1265,1268 ****
--- 1259,1265 ----
  		global $images, $board_config, $template, $phpbb_root_path, $mx_root_path, $theme, $current_module_images;
  		global $mx_block, $mx_user;
+ 		
+ 		//This will  keep loaded images
+ 		$mx3_images = $images;
  
  		//unset($GLOBALS['MX_TEMPLATE_CONFIG']);
***************
*** 1349,1352 ****
--- 1346,1352 ----
  		$module_key = !empty($module_root_path) ? $module_root_path : 'core';
  		$this->template_names[$module_key] = $template_name;
+ 		
+ 		//This will  keep loaded images
+ 		$images = &$mx3_images;		
  
  		unset($mx_images);
***************
*** 1504,1507 ****
--- 1504,1513 ----
  		//
  		$this->_init_style();
+ 		
+ 		//
+ 		// Load images
+ 		//
+ 		$this->_load_phpbb_images();
+ 		$this->_load_mxbb_images();		
  	}