[mxbb-commits] core index.php,1.41,1.42 login.php,1.10,1.11

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

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4621

Modified Files:
	index.php login.php 
Log Message:
minor fixes

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/login.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** login.php	20 Sep 2005 15:30:58 -0000	1.10
--- login.php	1 Oct 2005 08:36:13 -0000	1.11
***************
*** 102,106 ****
  					}
  
! 					$layouttemplate->assign_vars(array(
  						'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  					);
--- 102,106 ----
  					}
  
! 					$template->assign_vars(array(
  						'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  					);
***************
*** 122,126 ****
  			}
  
! 			$layouttemplate->assign_vars(array(
  				'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  			);
--- 122,126 ----
  			}
  
! 			$template->assign_vars(array(
  				'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">")
  			);

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** index.php	21 Sep 2005 20:24:44 -0000	1.41
--- index.php	1 Oct 2005 08:36:13 -0000	1.42
***************
*** 233,242 ****
  					// Output editcp controls/buttons
  					//
! 					if ( $mx_dynamic_block->dynamic_block_id > 0 && $subblock == $total_subs - 1)
  					{
  						$mx_dynamic_block->output_cp_button( $edit_on );
  					}
  					
! 					if ( is_object($mx_parent_block) && $subblock == $total_subs - 1)
  					{
  						$mx_parent_block->output_cp_button( $edit_on );
--- 233,242 ----
  					// Output editcp controls/buttons
  					//
! 					if ( $mx_dynamic_block->dynamic_block_id > 0 && $subblock == $total_subs - 1 && $mx_dynamic_block->auth_edit )
  					{
  						$mx_dynamic_block->output_cp_button( $edit_on );
  					}
  					
! 					if ( is_object($mx_parent_block) && $subblock == $total_subs - 1 && $mx_parent_block->auth_edit )
  					{
  						$mx_parent_block->output_cp_button( $edit_on );
***************
*** 281,304 ****
  				// Output some subblock wrappers
  				//
! 				if ( $mx_parent_block->is_sub )
  				{
! 					if ( $subblock == 0 )
! 					{
! 						$layouttemplate->assign_block_vars('layout_column.blocks.sub_start', array());
! 						$inner_space = '';
! 					}
! 					else 
! 					{
! 						$inner_space = '<td width="'.$mx_parent_block->sub_inner_space.'">&nbsp;</td>';
! 					}
! 						
! 					$layouttemplate->assign_block_vars('layout_column.blocks.sub_col', array(
! 						'INNER_SPACE' => $inner_space,
! 						'BLOCK_SIZE' => $mx_parent_block->sub_block_sizes[$subblock]
! 					));
! 						
! 					if ( intval($subblock + 1) == $total_subs )
  					{
! 						$layouttemplate->assign_block_vars('layout_column.blocks.sub_end', array());
  					}
  				}
--- 281,307 ----
  				// Output some subblock wrappers
  				//
! 				if (isset($mx_parent_block))
  				{
! 					if ( $mx_parent_block->is_sub )
  					{
! 						if ( $subblock == 0 )
! 						{
! 							$layouttemplate->assign_block_vars('layout_column.blocks.sub_start', array());
! 							$inner_space = '';
! 						}
! 						else 
! 						{
! 							$inner_space = '<td width="'.$mx_parent_block->sub_inner_space.'">&nbsp;</td>';
! 						}
! 							
! 						$layouttemplate->assign_block_vars('layout_column.blocks.sub_col', array(
! 							'INNER_SPACE' => $inner_space,
! 							'BLOCK_SIZE' => $mx_parent_block->sub_block_sizes[$subblock]
! 						));
! 							
! 						if ( intval($subblock + 1) == $total_subs )
! 						{
! 							$layouttemplate->assign_block_vars('layout_column.blocks.sub_end', array());
! 						}
  					}
  				}
***************
*** 310,324 ****
  			// Destroy parent block data
  			//
! 			if ( $mx_parent_block->is_sub )
  			{
  				unset( $mx_parent_block );
  			}
  			
! 			if ( is_object($mx_dynamic_block) )
  			{
  				unset( $mx_dynamic_block );
  			}			
  			
! 			$mx_block->kill_me();
  		}
  		
--- 313,327 ----
  			// Destroy parent block data
  			//
! 			if ( isset($mx_parent_block) && $mx_parent_block->is_sub )
  			{
  				unset( $mx_parent_block );
  			}
  			
! 			if ( isset($mx_dynamic_block) && is_object($mx_dynamic_block) )
  			{
  				unset( $mx_dynamic_block );
  			}			
  			
! 			$mx_block->kill_me($block_id);
  		}