aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php3
-rwxr-xr-xphpBB/install/index.php2
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