mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-09-08 20:41:52 +02:00
parent f65b60d5bc 619820a059
commit 17c4fe6f9e
24 changed files with 331 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_icons.php
View File

@@ -20,8 +20,8 @@ if (!defined('IN_PHPBB'))
}
/**
* @todo [smilies] check regular expressions for special char replacements (stored specialchared in db)
*/
* @todo {smilies} check regular expressions for special char replacements (stored specialchared in db)
*/
class acp_icons
{
var $u_action;

4
phpBB/includes/acp/acp_words.php
View File

@@ -20,8 +20,8 @@ if (!defined('IN_PHPBB'))
}
/**
* @todo [words] check regular expressions for special char replacements (stored specialchared in db)
*/
* @todo {words} check regular expressions for special char replacements (stored specialchared in db)
*/
class acp_words
{
var $u_action;

4
phpBB/includes/functions_compatibility.php
View File

@@ -455,8 +455,8 @@ function phpbb_realpath($path)
* Determine which plural form we should use.
* For some languages this is not as simple as for English.
*
* @param $rule int ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html
* @param $number int|float The number we want to get the plural case for. Float numbers are floored.
* @param int $rule ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html
* @param int|float $number The number we want to get the plural case for. Float numbers are floored.
* @return int The plural-case we need to use for the number plural-rule combination
*
* @deprecated 3.2.0-dev (To be removed: 4.0.0)