[Phpbb-checkins] CVS: phpBB2 upgrade.php,1.2,1.3

[Jonathan H. <the...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19438

Modified Files:
	upgrade.php 
Log Message:
Some additional modifications for merging install with upgrade...


Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/upgrade.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** upgrade.php	2001/10/26 23:26:54	1.2
--- upgrade.php	2001/11/09 15:02:46	1.3
***************
*** 19,26 ****
   *
   ***************************************************************************/
! 
! include('extension.inc');
! include('config.'.$phpEx);
! include('includes/constants.'.$phpEx);
  include('includes/db.'.$phpEx);
  include('includes/bbcode.'.$phpEx);
--- 19,32 ----
   *
   ***************************************************************************/
! if ( !defined('INSTALLING') )
! {
! 	//
! 	// If we are being called from the install script then we don't need these
! 	// as they are already included.
! 	//
! 	include('extension.inc');
! 	include('config.'.$phpEx);
! 	include('includes/constants.'.$phpEx);
! }
  include('includes/db.'.$phpEx);
  include('includes/bbcode.'.$phpEx);