[mxbb-commits] core/includes mx_functions_core.php, 1.62, 1.63 mx_functions_style.php, 1.34, 1.35

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

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

Modified Files:
	mx_functions_core.php mx_functions_style.php 
Log Message:
minor fixes for the nav module

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** mx_functions_core.php	30 Jan 2008 09:10:56 -0000	1.62
--- mx_functions_core.php	1 Feb 2008 16:16:32 -0000	1.63
***************
*** 3227,3230 ****
--- 3227,3231 ----
  				$data = file_get_contents($mx_block->module_root_path . $text);
  
+ 				// Substitute theme variables
  				foreach ($theme as $key => $value)
  				{
***************
*** 3232,3235 ****
--- 3233,3237 ----
  				}
  
+ 				// Substitute block data
  				foreach ($mx_block->block_info as $key => $value)
  				{

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mx_functions_style.php	21 Jan 2008 14:43:49 -0000	1.34
--- mx_functions_style.php	1 Feb 2008 16:16:33 -0000	1.35
***************
*** 474,478 ****
  	var $template_path = 'templates/';
  
! 	var $template_name = '' ;
  	var $current_template_path = '';
  
--- 474,479 ----
  	var $template_path = 'templates/';
  
! 	var $template_name = '';
! 	var $template_names = array();
  	var $current_template_path = '';
  
***************
*** 653,657 ****
  			//$board_config['default_lang'] = 'english';
  		}
! 		
  		include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys
  		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
--- 654,658 ----
  			//$board_config['default_lang'] = 'english';
  		}
! 
  		include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys
  		include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
***************
*** 809,813 ****
  			mx_message_die(CRITICAL_ERROR, "Could not query database for theme info", '', __LINE__, __FILE__, $sql);
  		}
! 		
  		//
  		// Use default style if custom style doesn't exist.
--- 810,814 ----
  			mx_message_die(CRITICAL_ERROR, "Could not query database for theme info", '', __LINE__, __FILE__, $sql);
  		}
! 
  		//
  		// Use default style if custom style doesn't exist.
***************
*** 845,849 ****
  				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  			}
! 			
  			//
  			// Last desperate try...
--- 846,850 ----
  				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
  			}
! 
  			//
  			// Last desperate try...
***************
*** 1231,1234 ****
--- 1232,1241 ----
  		}
  
+ 		//
+ 		// What template is the module using?
+ 		//
+ 		$module_key = !empty($module_root_path) ? $module_root_path : 'core';
+ 		$this->template_names[$module_key] = $template_name;
+ 
  		unset($mx_images);
  	}