[mxbb-commits] core index.php,1.30,1.31

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

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

Modified Files:
	index.php 
Log Message:
  weird conflict...did you edit these lately...i see no diff??

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/index.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** index.php	13 Apr 2005 20:15:56 -0000	1.30
--- index.php	16 Apr 2005 21:51:35 -0000	1.31
***************
*** 24,27 ****
--- 24,28 ----
  //define('MX_DEBUG', 1);
  define( 'IN_PORTAL', 1 );
+ 
  $mx_root_path = "./";
  
***************
*** 36,42 ****
--- 37,46 ----
  
  // Start session management
+ 
  $userdata = session_pagestart($user_ip, - ( 1000 + $page_id ));
  mx_init_userprefs($userdata);
  
+ // End session management
+ 
  if ( $mx_request_vars->is_request('mx_copy') )
  {
***************
*** 59,62 ****
--- 63,68 ----
  }
  
+ // Now use the session data
+ 
  $page_row = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['page_info'];
  	
***************
*** 83,86 ****
--- 89,95 ----
  	mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true));
  }
+ 
+ // Output header
+ 
  include($mx_root_path . 'includes/page_header.' . $phpEx);
  
***************
*** 323,327 ****
  } // for ... column
  
! // Output page
  	
  $layouttemplate->pparse('mx_main_layout');
--- 332,336 ----
  } // for ... column
  
! // Output page 
  	
  $layouttemplate->pparse('mx_main_layout');