aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/upgrade.php14
1 files 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);