[mxbb-commits] core/includes mx_functions_admincp.php, 1.23, 1.24 mx_functions_style.php, 1.6, 1.7 page_header.php, 1.37, 1.38 page_tail.php, 1.25, 1.26

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

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

Modified Files:
	mx_functions_admincp.php mx_functions_style.php 
	page_header.php page_tail.php 
Log Message:
Further minor tweaks...

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** page_header.php	17 Jun 2006 20:09:07 -0000	1.37
--- page_header.php	27 Jun 2006 18:12:22 -0000	1.38
***************
*** 490,497 ****
  $meta_str .= $header . "\n";
  
! $layouttemplate->assign_vars(array(
! 	'META' => $meta_str)
! );
! 
  $layouttemplate->pparse('overall_header');
  ?>
\ No newline at end of file
--- 490,494 ----
  $meta_str .= $header . "\n";
  
! $layouttemplate->assign_vars(array( 'META' => $meta_str) );
  $layouttemplate->pparse('overall_header');
  ?>
\ No newline at end of file

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_functions_style.php	18 Jun 2006 10:46:03 -0000	1.6
--- mx_functions_style.php	27 Jun 2006 18:12:22 -0000	1.7
***************
*** 20,23 ****
--- 20,28 ----
  include_once($phpbb_root_path . 'includes/template.' . $phpEx);
  
+ //
+ // Including phpBB session functions
+ //
+ include_once($phpbb_root_path . 'includes/sessions.' . $phpEx);
+ 
  /**
   * Class: mx_Template

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mx_functions_admincp.php	26 Jun 2006 21:32:22 -0000	1.23
--- mx_functions_admincp.php	27 Jun 2006 18:12:22 -0000	1.24
***************
*** 2822,2825 ****
--- 2822,2838 ----
  				$output_message .= !empty($message_tmp) ? '<br /><br />' . $message_tmp : '';
  			}
+ 
+ 			//
+ 			// If this is a new demo block, give it parameters (Fix for 2.8 B4)
+ 			//
+ 			if( $module_data[0] == 'block' )
+ 			{
+ 				//
+ 				// Now update affected block_id(s)
+ 				// ...and cache
+ 				//
+ 				$message_tmp = $this->update_block_parameter_data($module_data[4]);
+ 				$output_message .= !empty($message_tmp) ? '<br /><br />' . $message_tmp : '';
+ 			}
  		}
  

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** page_tail.php	17 Jun 2006 20:09:07 -0000	1.25
--- page_tail.php	27 Jun 2006 18:12:22 -0000	1.26
***************
*** 35,39 ****
  		'EDITCP_EXPAND_IMG' 		=> $images['mx_expand'],
  		'EDITCP_DYNAMIC_IMG' 		=> $mx_page->editcp_show ? $images['mx_contract'] : $images['mx_expand'],
! 		'ADMIN_OPTIONS' 			=> $lang['Show_admin_options'],
  	));
  }
--- 35,39 ----
  		'EDITCP_EXPAND_IMG' 		=> $images['mx_expand'],
  		'EDITCP_DYNAMIC_IMG' 		=> $mx_page->editcp_show ? $images['mx_contract'] : $images['mx_expand'],
! 		'ADMIN_OPTIONS' 			=> $lang['Show_admin_options']
  	));
  }
***************
*** 86,91 ****
  	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '',
  	'ADMIN_LINK' 				=> $admin_link,
! 	'EXECUTION_STATS'			=> (defined('DEBUG')) ? $debug_output : '')
! );
  
  $template->pparse('overall_footer');
--- 86,91 ----
  	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '',
  	'ADMIN_LINK' 				=> $admin_link,
! 	'EXECUTION_STATS'			=> (defined('DEBUG')) ? $debug_output : ''
! ));
  
  $template->pparse('overall_footer');
***************
*** 126,129 ****
--- 126,130 ----
  	echo pack('V', $gzip_size);
  }
+ 
  exit;
  ?>
\ No newline at end of file