aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-02-24 23:45:55 +0100
committerIgor Wiedler <igor@wiedler.ch>2011-02-24 23:45:55 +0100
commit76ad7c938d7834c09c98b6759dca4a196eb3c29b (patch)
tree97507660568758b98a5f98a49be781dea9f8602b /phpBB/develop
parentcf5253c7b8407b7ff1c998aae9408c112b90cf05 (diff)
parent5a5560d2004bbf93a24d05353fe6f765311a991a (diff)
downloadforums-76ad7c938d7834c09c98b6759dca4a196eb3c29b.tar
forums-76ad7c938d7834c09c98b6759dca4a196eb3c29b.tar.gz
forums-76ad7c938d7834c09c98b6759dca4a196eb3c29b.tar.bz2
forums-76ad7c938d7834c09c98b6759dca4a196eb3c29b.tar.xz
forums-76ad7c938d7834c09c98b6759dca4a196eb3c29b.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
Diffstat (limited to 'phpBB/develop')
-rw-r--r--phpBB/develop/mysql_upgrader.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 32af0bf320..6c052b03eb 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -21,6 +21,7 @@
die("Please read the first lines of this script for instructions on how to enable it");
define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx);