diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
| commit | a43ead8ee7db832871db9cd2c4f294108398f4b0 (patch) | |
| tree | 417710b9e382752ac1f815633e67f73cdc7e3fe0 /phpBB/install | |
| parent | 599a5964c064978b15653b05c4709f2c72943bb2 (diff) | |
| download | forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.gz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.bz2 forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.xz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.zip | |
do not get too excited
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 3 | ||||
| -rwxr-xr-x | phpBB/install/index.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d255688f55..ffdedf0fd9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -10,6 +10,7 @@ $updates_to_version = '3.0.RC4'; +// Return if we "just include it" to find out for which version the database update is responsuble for if (defined('IN_PHPBB') && defined('IN_INSTALL')) { return; @@ -20,7 +21,7 @@ if (defined('IN_PHPBB') && defined('IN_INSTALL')) define('IN_PHPBB', true); define('IN_INSTALL', true); -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); // Report all errors, except notices diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 08e937f4cc..d2a806014d 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -15,7 +15,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); /**#@-*/ -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); // Report all errors, except notices |