[mxbb-commits] core/includes mx_functions_style.php,1.111,1.112

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
fix

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** mx_functions_style.php	6 Nov 2008 18:04:37 -0000	1.111
--- mx_functions_style.php	8 Nov 2008 08:33:58 -0000	1.112
***************
*** 717,721 ****
  		$init_style = $mx_request_vars->post('default_style', MX_TYPE_INT, $init_style);
  
! 		$theme = $this->_setup_style($init_style, $user_style);
  	}
  
--- 717,721 ----
  		$init_style = $mx_request_vars->post('default_style', MX_TYPE_INT, $init_style);
  
! 		$theme = $this->_setup_style($init_style, $user_style);		
  	}
  
***************
*** 729,733 ****
  	function _setup_style($init_style, $user_style = 0)
  	{
! 		global $db, $board_config, $portal_config, $template, $phpbb_root_path, $mx_root_path, $theme;
  
  		$row = false;
--- 729,735 ----
  	function _setup_style($init_style, $user_style = 0)
  	{
! 		global $db, $board_config, $portal_config, $template, $phpbb_root_path, $mx_root_path;
! 		
! 		global $images, $theme;
  
  		$row = false;
***************
*** 860,865 ****
--- 862,871 ----
  		// Load images
  		//
+ 		/*
+ 		* Moved for compatibility to new sessions
  		$this->_load_phpbb_images();
  		$this->_load_mxbb_images();
+ 		*
+ 		*/
  
  		//
***************
*** 970,973 ****
--- 976,983 ----
  	 * @access private
  	 */
+ 	/**
+ 	 * Enter description here...
+ 	 * @access private
+ 	 */	 
  	function _load_phpbb_images()
  	{
***************
*** 1116,1120 ****
  				$images[$key] = str_replace(PHPBB_URL . PHPBB_URL, PHPBB_URL, PHPBB_URL . $images[$key]);
  			}
! 		}
  	}
  
--- 1126,1130 ----
  				$images[$key] = str_replace(PHPBB_URL . PHPBB_URL, PHPBB_URL, PHPBB_URL . $images[$key]);
  			}
! 		}		
  	}
  
***************
*** 1220,1224 ****
  		$images = &$mx3_images;
  
! 		unset($mx_images);
  	}
  
--- 1230,1234 ----
  		$images = &$mx3_images;
  
! 		unset($mx_images);		
  	}
  
***************
*** 1362,1365 ****
--- 1372,1377 ----
  	function init_style()
  	{
+ 		global $images;
+ 		
  		//
  		// The User class must first be initiated.
***************
*** 1378,1383 ****
  		// Load images
  		//
! 		$this->_load_phpbb_images();
! 		$this->_load_mxbb_images();
  	}
  
--- 1390,1395 ----
  		// Load images
  		//
! 		$this->_load_phpbb_images();		
! 		$this->_load_mxbb_images();		
  	}