[mxbb-commits] core/includes mx_functions_style.php,1.138,1.139

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20504

Modified Files:
	mx_functions_style.php 
Log Message:


Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** mx_functions_style.php	7 Jul 2013 02:13:52 -0000	1.138
--- mx_functions_style.php	27 Aug 2013 06:30:49 -0000	1.139
***************
*** 285,296 ****
  				*/
  				
! 				//
! 				// This doesn't fit in...so left as is.
! 				//
  				if(@file_exists($phpbb_root_path . 'adm/style/' . $filename) )
  				{
! 					//
! 					// First check  ACP template
! 					//
  					$this->module_template_path = $phpbb_root_path . 'adm/style/';
  					$temppath = $phpbb_root_path . 'adm/style/' . $filename;
--- 285,296 ----
  				*/
  				
! 				/*
! 				* This doesn't fit in...so left as is.
! 				*/
  				if(@file_exists($phpbb_root_path . 'adm/style/' . $filename) )
  				{
! 					/*
! 					* First check  ACP template
! 					*/
  					$this->module_template_path = $phpbb_root_path . 'adm/style/';
  					$temppath = $phpbb_root_path . 'adm/style/' . $filename;
***************
*** 1106,1109 ****
--- 1106,1126 ----
  			}
  		}
+ 		/* 
+ 		* Load images for example for 
+ 		* ACP images/admin_icons/
+ 		*/
+ 		switch (PORTAL_BACKEND)
+ 		{
+ 			case 'phpbb2':
+ 				$this->_load_phpbb_images();
+ 				$this->_load_mxbb_images();
+ 				break;
+ 			case 'internal':				
+ 			case 'phpbb3':
+ 				$this->_load_mxbb_images();
+ 				break;
+ 		}		
+ 		// Load backend specific style defs.
+ 		$this->setup_style();
  		return $row;
  	}
***************
*** 1882,1896 ****
  		{
  			case 'internal':
- 				$this->_load_phpbb_images();		
- 				$this->_load_mxbb_images();	
  			break;
  				
  			case 'phpbb2':
! 			break;
! 			
! 			case 'phpbb3':
! 			
! 				//$this->_load_phpbb_images();		
! 				$this->_load_mxbb_images();	
  			break;
  		}
--- 1899,1907 ----
  		{
  			case 'internal':
  			break;
  				
  			case 'phpbb2':
! 			case 'phpbb3':	
! 				$this->_load_phpbb_images();		
  			break;
  		}
***************
*** 1898,1903 ****
  		
  		// Load images
! 		//$this->_load_phpbb_images();
! 		//$this->_load_mxbb_images();
  		
  		// Load backend specific style defs.
--- 1909,1913 ----
  		
  		// Load images
! 		$this->_load_mxbb_images();
  		
  		// Load backend specific style defs.