mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 20:40:24 +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

4
phpBB/includes/functions.php
View File

@@ -2904,7 +2904,7 @@ function meta_refresh($time, $url, $disable_cd_check = false)
*
* @param int $code HTTP status code
* @param string $message Message for the status code
* @return void
* @return null
*/
function send_status_line($code, $message)
{
@@ -4843,7 +4843,7 @@ function phpbb_get_plural_form($rule, $number)
*
* @param array $param Parameter array, see $param_defaults array.
*
* @return void
* @return null
*/
function phpbb_http_login($param)
{