[mxbb-commits] mx_kb/kb/includes functions_kb.php,1.23,1.24

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

Update of /cvsroot/mxbb/mx_kb/kb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15497

Modified Files:
	functions_kb.php 
Log Message:
mod_rewrite bugfix, when using dynamic subpages

Index: functions_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** functions_kb.php	28 Jan 2008 21:51:03 -0000	1.23
--- functions_kb.php	7 May 2008 20:07:38 -0000	1.24
***************
*** 1360,1363 ****
--- 1360,1364 ----
  
  		$pageId = empty($pageId) ? $page_id : $pageId;
+ 		$dynamicId = !empty($_GET['dynamic_block']) ? ( $non_html_amp ? '&dynamic_block=' : '&dynamic_block=' ) . $_GET['dynamic_block'] : '';
  
  		$args .= ($args == '' ? '' : '&' ) . 'modrewrite=no';
***************
*** 1378,1382 ****
  			if ( is_numeric( $pageId ) )
  			{
! 					$mxurl .= '?page=' . $pageId . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  			}
  			else
--- 1379,1383 ----
  			if ( is_numeric( $pageId ) )
  			{
! 					$mxurl .= '?page=' . $pageId . $dynamicId . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  			}
  			else
***************
*** 1400,1403 ****
--- 1401,1406 ----
  		global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block;
  
+ 		$dynamicId = !empty($_GET['dynamic_block']) ? ( $non_html_amp ? '&dynamic_block=' : '&dynamic_block=' ) . $_GET['dynamic_block'] : '';
+ 
  		if ( !MXBB_MODULE )
  		{
***************
*** 1415,1419 ****
  			if ( is_numeric( $page_id ) )
  			{
! 				$mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  			}
  			else
--- 1418,1422 ----
  			if ( is_numeric( $page_id ) )
  			{
! 				$mxurl .= '?page=' . $page_id . $dynamicId . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  			}
  			else