[mxbb-commits] core/includes mx_functions_phpbb.php, 1.26, 1.27 page_tail.php, 1.26, 1.27

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

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

Modified Files:
	mx_functions_phpbb.php page_tail.php 
Log Message:
updated mod_rewrite mx_append_sid function
bug in page_tail, for debug div
bugs in includeX block
minor template bugs

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mx_functions_phpbb.php	16 Aug 2006 20:00:33 -0000	1.26
--- mx_functions_phpbb.php	28 Aug 2006 21:10:52 -0000	1.27
***************
*** 358,362 ****
   * @return string
   */
! function mx_append_sid( $url, $non_html_amp = false )
  {
  	global $portal_config, $mx_mod_rewrite;
--- 358,362 ----
   * @return string
   */
! function mx_append_sid( $url, $non_html_amp = false, $mod_rewrite_only = false )
  {
  	global $portal_config, $mx_mod_rewrite;
***************
*** 373,377 ****
  	// Replaces same function in sessions.php
  	//
! 	return append_sid( $url, $non_html_amp );
  }
  
--- 373,384 ----
  	// Replaces same function in sessions.php
  	//
! 	if ($mod_rewrite_only)
! 	{
! 		return $url;
! 	}
! 	else
! 	{
! 		return append_sid( $url, $non_html_amp );
! 	}
  }
  

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** page_tail.php	27 Jun 2006 18:12:22 -0000	1.26
--- page_tail.php	28 Aug 2006 21:10:52 -0000	1.27
***************
*** 73,78 ****
  
  		$debug_output .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;' : '?') . 'explain=1">Explain</a>';
- 		$debug_output .= '</span></div>';
  	}
  }
  
--- 73,78 ----
  
  		$debug_output .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;' : '?') . 'explain=1">Explain</a>';
  	}
+ 	$debug_output .= '</span></div>';
  }