diff options
| author | the_systech <the_systech@users.sourceforge.net> | 2001-11-09 15:02:46 +0000 |
|---|---|---|
| committer | the_systech <the_systech@users.sourceforge.net> | 2001-11-09 15:02:46 +0000 |
| commit | d265bbc317f299bdb0137f678d6050ad302136ff (patch) | |
| tree | f4bba29aff0e5cfda6e0aed771524eb26383e2bc /phpBB/upgrade.php | |
| parent | 63fbbff7e770ade174456c7271b2974041277b93 (diff) | |
| download | forums-d265bbc317f299bdb0137f678d6050ad302136ff.tar forums-d265bbc317f299bdb0137f678d6050ad302136ff.tar.gz forums-d265bbc317f299bdb0137f678d6050ad302136ff.tar.bz2 forums-d265bbc317f299bdb0137f678d6050ad302136ff.tar.xz forums-d265bbc317f299bdb0137f678d6050ad302136ff.zip | |
Some additional modifications for merging install with upgrade...
git-svn-id: file:///svn/phpbb/trunk@1299 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/upgrade.php')
| -rw-r--r-- | phpBB/upgrade.php | 14 |
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); |