[mxbb-commits] core/includes mx_functions.php,1.83,1.84

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

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

Modified Files:
	mx_functions.php 
Log Message:
Trimmed the get_page_id() function a bit, to find also default dynamic blocks and making the query a bit more limited

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** mx_functions.php	3 May 2008 19:09:16 -0000	1.83
--- mx_functions.php	21 May 2008 22:08:33 -0000	1.84
***************
*** 802,806 ****
  					" . COLUMN_TABLE . " col,
  					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par
  				WHERE pag.page_id = col.page_id
  					AND bct.column_id = col.column_id
--- 802,807 ----
  					" . COLUMN_TABLE . " col,
  					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par,
! 					" . FUNCTION_TABLE . " fcn
  				WHERE pag.page_id = col.page_id
  					AND bct.column_id = col.column_id
***************
*** 808,811 ****
--- 809,814 ----
  					AND sys.parameter_id = par.parameter_id
  					AND par.parameter_name = 'block_ids'
+ 					AND par.function_id = fcn.function_id
+ 					AND fcn.function_file = 'mx_multiple_blocks.php'
  					ORDER BY sys.block_id";
  
***************
*** 821,825 ****
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id = $search_item)
  					{
  						$p_row = $temp_row;
--- 824,875 ----
  				foreach($block_ids_array as $key => $block_id)
  				{
! 					if ($block_id == $search_item)
! 					{
! 						$p_row = $temp_row;
! 						continue;
! 					}
! 				}
! 
! 				if (!empty($p_row['page_id']))
! 				{
! 					continue;
! 				}
! 			}
! 			$db->sql_freeresult($result);
! 		}
! 
! 		if( empty($p_row['page_id']) )
! 		{
! 			//
! 			// Find if block is a default dynamic block (desperate try)
! 			//
! 			$sql = "SELECT pag.page_id, pag.page_name, pag.page_desc, sys.parameter_value
! 				FROM " . COLUMN_BLOCK_TABLE . " bct,
! 			       	" . PAGE_TABLE . " pag,
! 					" . COLUMN_TABLE . " col,
! 					" . BLOCK_SYSTEM_PARAMETER_TABLE . " sys,
! 					" . PARAMETER_TABLE . " par,
! 					" . FUNCTION_TABLE . " fcn
! 				WHERE pag.page_id = col.page_id
! 					AND bct.column_id = col.column_id
! 					AND bct.block_id = sys.block_id
! 					AND sys.parameter_id = par.parameter_id
! 					AND par.parameter_name = 'default_block_id'
! 					AND par.function_id = fcn.function_id
! 					AND fcn.function_file = 'mx_dynamic.php'
! 		   		ORDER BY sys.block_id";
! 
! 			if( !($p_result = $db->sql_query($sql)) )
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not query column list", '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			while( $temp_row = $db->sql_fetchrow($p_result) )
! 			{
! 				$block_ids_array = explode(',' , $temp_row['parameter_value']);
! 
! 				foreach($block_ids_array as $key => $block_id)
! 				{
! 					if ($block_id == $search_item)
  					{
  						$p_row = $temp_row;