diff options
author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 21:14:39 -0600 |
---|---|---|
committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 21:14:39 -0600 |
commit | 0042f071476b75258f5f8ea0b5b9fcb445ffde23 (patch) | |
tree | 67cbafd7c655ad94809fef5f7dbe3a23525b232b /phpBB/includes/functions.php | |
parent | c911a34b5b7541b46ee2408da366d2dc7c302090 (diff) | |
parent | b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (diff) | |
download | forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.gz forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.bz2 forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.xz forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.zip |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 69b6932d30..c2694d3bd7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) { |