aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-13 23:58:29 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-13 23:58:29 +0100
commit405a1a1793e7a81bdb8fa3e80f66ad4075f62c54 (patch)
tree5d1bd2bde991c7c3a4129ded2d888d08d97958d4
parent6702a11dcb397d1b07c7bbba2206ad595712d435 (diff)
parent71e07ecc471f013aec698654cf5cfa928c8ad0e8 (diff)
downloadforums-405a1a1793e7a81bdb8fa3e80f66ad4075f62c54.tar
forums-405a1a1793e7a81bdb8fa3e80f66ad4075f62c54.tar.gz
forums-405a1a1793e7a81bdb8fa3e80f66ad4075f62c54.tar.bz2
forums-405a1a1793e7a81bdb8fa3e80f66ad4075f62c54.tar.xz
forums-405a1a1793e7a81bdb8fa3e80f66ad4075f62c54.zip
Merge remote-tracking branch 'EXreaction/ticket/11320' into develop
* EXreaction/ticket/11320: [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 47459832d5..20ae384f21 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -77,6 +77,11 @@ class phpbb_test_case_helpers
{
include($test_config);
+ if (!function_exists('phpbb_convert_30_dbms_to_31'))
+ {
+ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+ }
+
$config = array_merge($config, array(
'dbms' => phpbb_convert_30_dbms_to_31($dbms),
'dbhost' => $dbhost,