[mxbb-commits] core/includes/shared/phpbb3/includes functions_hook.php, 1.14, 1.15

[Culprit <cul...@us...>]

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

Modified Files:
	functions_hook.php 
Log Message:
new acp phpbb3 fixes

Index: functions_hook.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** functions_hook.php	18 Jun 2008 05:12:59 -0000	1.14
--- functions_hook.php	18 Jun 2008 08:11:20 -0000	1.15
***************
*** 168,171 ****
--- 168,173 ----
  			'#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$template->pparse(\'panel\');',
  			'#global #si' => 'global $mx_acp, ',
+ 			'#\s(header\()#si' => '// \1',
+ 			'#ob_start\(\'ob_gzhandler\'\);#si' => '// \0',
  		);
  
***************
*** 238,244 ****
  			$p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params  , $link_parts);
  			$link_compare_ary = @array_combine( $link_parts[1], $link_parts[2]);
! 			$eregi = 'adm/index.' . $phpEx . '?i=' . $panel_i . '&panel=' . $link_compare_ary['i'] . '&mode=' . $link_compare_ary['mode'];
  			$panel = $menu_action[$eregi];
! 			$link = 'index.' . $phpEx . '?cat=' . OLYMPUS_CATEGORY . '&i=' . $panel_i . '&panel=' . $menu_action[$eregi] . '&mode=' . $link_compare_ary['mode'];
  			unset( $link_compare_ary['i']);
  			unset( $link_compare_ary['mode']);
--- 240,247 ----
  			$p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params  , $link_parts);
  			$link_compare_ary = @array_combine( $link_parts[1], $link_parts[2]);
! 			$eregi = "adm/index.{$phpEx}?i={$panel_i}&panel={$link_compare_ary[i]}&mode={$link_compare_ary[mode]}";
  			$panel = $menu_action[$eregi];
! 			$filename = basename( $_SERVER['PHP_SELF']);
! 			$link = "{$filename}?cat=" . OLYMPUS_CATEGORY . "&i={$panel_i}&panel=" .$menu_action[$eregi] . "&mode={$link_compare_ary[mode]}";
  			unset( $link_compare_ary['i']);
  			unset( $link_compare_ary['mode']);
***************
*** 258,262 ****
  			if ( !empty($link_orig) )
  			{
! 				$preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => $admin_path . $link));
  			}
  		}
--- 261,265 ----
  			if ( !empty($link_orig) )
  			{
! 				$preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link));
  			}
  		}