1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

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
This commit is contained in:
Nils Adermann
2011-01-23 18:44:03 +01:00
8 changed files with 322 additions and 1 deletions

View File

@@ -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);