mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
Joas Schilling
2014-03-13 10:27:19 +01:00
parent d69012ea6d 03eb23cbae
commit dbebe30c9a
4 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -473,6 +473,16 @@ class phpbb_functional_test_case extends phpbb_test_case
global $config;
$config = new \phpbb\config\config(array());
/*
* Add required config entries to the config array to prevent
* set_config() sending an INSERT query for already existing entries,
* resulting in a SQL error.
* This is because set_config() first sends an UPDATE query, then checks
* sql_affectedrows() which can be 0 (e.g. on MySQL) when the new
* data is already there.
*/
$config['newest_user_colour'] = '';
$config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600;