[mxbb-commits] core/modules/mx_mod_rewrite/includes rewrite_functions.php, 1.4.2.1, 1.4.2.2

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

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

Modified Files:
      Tag: core28x
	rewrite_functions.php 
Log Message:
Minor update to rewriting urls

Index: rewrite_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_mod_rewrite/includes/rewrite_functions.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** rewrite_functions.php	3 Feb 2008 19:25:47 -0000	1.4.2.1
--- rewrite_functions.php	7 May 2008 20:04:56 -0000	1.4.2.2
***************
*** 25,31 ****
--- 25,37 ----
   		global $mx_root_path;
  
+   		if (substr_count($url, 'modrewrite=no'))
+  		{
+  			return $url;
+  		}
+ 
   		//
   		// First redirect to *.htm
   		//
+  		/*
  		$input = array(
  			"'(?)index.php'",
***************
*** 35,45 ****
  		);
  		$url = preg_replace($input, $output, $url);
  
  		//
  		// Load Custom Defs (if any)
  		//
! 		if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.php' ) )
  		{
! 			include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.php' );
  
  			if (class_exists('mx_mod_rewrite_custom'))
--- 41,52 ----
  		);
  		$url = preg_replace($input, $output, $url);
+ 		*/
  
  		//
  		// Load Custom Defs (if any)
  		//
! 		if ( file_exists( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.' . $phpEx ) )
  		{
! 			include_once( $mx_root_path . 'modules/mx_mod_rewrite/includes/rewrite_custom_defs.' . $phpEx );
  
  			if (class_exists('mx_mod_rewrite_custom'))
***************
*** 62,67 ****
  			// General
  			//
! 			"'(?)index.htm\?page=([0-9]*)'",
! 			"'(?)index.htm\?block_id=([0-9]*)'",
  			"'(&|\&)dynamic_block=([0-9]*)'",
  			"'(&|\&)cat_link=([0-9]*)'",
--- 69,74 ----
  			// General
  			//
! 			"'(?)index.php\?page=([0-9]*)'",
! 			"'(?)index.php\?block_id=([0-9]*)'",
  			"'(&|\&)dynamic_block=([0-9]*)'",
  			"'(&|\&)cat_link=([0-9]*)'",