mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
Some additional modifications for merging install with upgrade...
git-svn-id: file:///svn/phpbb/trunk@1299 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -18,10 +18,16 @@
|
|||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
if ( !defined('INSTALLING') )
|
||||||
include('extension.inc');
|
{
|
||||||
include('config.'.$phpEx);
|
//
|
||||||
include('includes/constants.'.$phpEx);
|
// 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/db.'.$phpEx);
|
||||||
include('includes/bbcode.'.$phpEx);
|
include('includes/bbcode.'.$phpEx);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user