aboutsummaryrefslogtreecommitdiffstats
path: root/tests/bootstrap.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-01-23 18:44:03 +0100
committerNils Adermann <naderman@naderman.de>2011-01-23 18:44:03 +0100
commit10169d1c3e6c68f596bb03acb3b6389eb6056804 (patch)
treefe17008b34a4d7a517c5397d36e4829fb471a88a /tests/bootstrap.php
parent1196b96462e519271d01bc1821aafc35aafc0fd8 (diff)
parente1e84f9bd080bb6cad604611535dc38e4109eb47 (diff)
downloadforums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar
forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.gz
forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.bz2
forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.tar.xz
forums-10169d1c3e6c68f596bb03acb3b6389eb6056804.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [task/session-tests] Renamed assertSqlResultEquals and fixed its param order [task/session-tests] Test additional combinations of session_begin. [task/session-tests] Added tests for the session class. Conflicts: tests/mock/cache.php
Diffstat (limited to 'tests/bootstrap.php')
-rw-r--r--tests/bootstrap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 8d4e9c4527..cee60c451b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,7 +10,7 @@
define('IN_PHPBB', true);
$phpbb_root_path = 'phpBB/';
$phpEx = 'php';
-$table_prefix = '';
+$table_prefix = 'phpbb_';
error_reporting(E_ALL & ~E_DEPRECATED);