[mxbb-commits] core/includes mx_functions.php,1.71,1.72

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

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

Modified Files:
	mx_functions.php 
Log Message:
Quick fix for site navigation

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** mx_functions.php	19 Jun 2007 19:10:44 -0000	1.71
--- mx_functions.php	23 Jul 2007 22:52:43 -0000	1.72
***************
*** 243,249 ****
   * @param string $function_file get block_list for $function_file
   * @param boolean $multiple_select
   * @return string (html)
   */
! function get_list_formatted($type, $id, $name_select = '', $function_file = '', $multiple_select = false)
  {
  	global $db, $lang;
--- 243,250 ----
   * @param string $function_file get block_list for $function_file
   * @param boolean $multiple_select
+  * @param string $function_file2 get block_list also for $function_file2
   * @return string (html)
   */
! function get_list_formatted($type, $id, $name_select = '', $function_file = '', $multiple_select = false, $function_file2 = '')
  {
  	global $db, $lang;
***************
*** 287,291 ****
  		$descfield = 'block_desc';
  
! 		$function_file_filter = ( !empty($function_file) ? " AND fnc.function_file = '$function_file'" : '' );
  
  		$sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc
--- 288,293 ----
  		$descfield = 'block_desc';
  
! 		$function_file_filter_temp = ( !empty($function_file2) ? " OR fnc.function_file = '$function_file2'" : '' );
! 		$function_file_filter = ( !empty($function_file) ? " AND ( fnc.function_file = '$function_file' ".$function_file_filter_temp.")" : '' );
  
  		$sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc