[mxbb-commits] core/admin admin_mx_block_cp.php,1.13,1.14

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

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

Modified Files:
	admin_mx_block_cp.php 
Log Message:
a couple of issues with the blockCP

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admin_mx_block_cp.php	22 Aug 2006 20:21:49 -0000	1.13
--- admin_mx_block_cp.php	24 Aug 2006 21:12:51 -0000	1.14
***************
*** 55,59 ****
  // Initial vars
  //
! $block_id = $mx_request_vars->request('block_id', MX_TYPE_INT, '');
  $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 0);
  $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0);
--- 55,59 ----
  // Initial vars
  //
! $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, '');
  $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 0);
  $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0);
***************
*** 117,123 ****
  	// Get vars
  	//
- 	//$portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1);
- 	$id = $mx_request_vars->request('id', MX_TYPE_INT, '');
- 
  	if( !$submit_pars )
  	{
--- 117,120 ----
***************
*** 128,132 ****
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $id);
  
  		//
--- 125,129 ----
  		// Send to adminCP
  		//
! 		$result_message = $mx_admin->do_it($mode, $action, $block_id);
  
  		//
***************
*** 152,156 ****
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($id);
  	}
  
--- 149,153 ----
  		// Send to BlockCP
  		//
! 		$result_message = $mx_blockcp->submit_parameters($block_id);
  	}