From d265bbc317f299bdb0137f678d6050ad302136ff Mon Sep 17 00:00:00 2001
From: the_systech <the_systech@users.sourceforge.net>
Date: Fri, 9 Nov 2001 15:02:46 +0000
Subject: [PATCH] Some additional modifications for merging install with
 upgrade...

git-svn-id: file:///svn/phpbb/trunk@1299 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/upgrade.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/phpBB/upgrade.php b/phpBB/upgrade.php
index fca68321bf..58bce9e8ce 100644
--- a/phpBB/upgrade.php
+++ b/phpBB/upgrade.php
@@ -18,10 +18,16 @@
  *   (at your option) any later version.
  *
  ***************************************************************************/
-
-include('extension.inc');
-include('config.'.$phpEx);
-include('includes/constants.'.$phpEx);
+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);