mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 21:10:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
This commit is contained in:
Nathan Guse
2012-12-07 21:14:39 -06:00
parent c911a34b5b b7b8fefdd0
commit 0042f07147
94 changed files with 1884 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_admin.php
View File

@@ -3324,7 +3324,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $
* @param int $flag The binary flag which is OR-ed with the current column value
* @param string $sql_more This string is attached to the sql query generated to update the table.
*
* @return void
* @return null
*/
function enable_bitfield_column_flag($table_name, $column_name, $flag, $sql_more = '')
{