diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-04 23:11:16 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-04 23:11:16 -0400 |
| commit | 22389d4324224f74e82aa4186c8b8d780ff38500 (patch) | |
| tree | aa56817bace607c1fce0277402acb649a27f425c /phpBB/includes/functions_content.php | |
| parent | 0bfd4639ab77a3126f9d1598fabd2209173ca1e9 (diff) | |
| parent | ec3f4db4254783a8542da5ed479949cee7a98454 (diff) | |
| download | forums-22389d4324224f74e82aa4186c8b8d780ff38500.tar forums-22389d4324224f74e82aa4186c8b8d780ff38500.tar.gz forums-22389d4324224f74e82aa4186c8b8d780ff38500.tar.bz2 forums-22389d4324224f74e82aa4186c8b8d780ff38500.tar.xz forums-22389d4324224f74e82aa4186c8b8d780ff38500.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 179fd3c2f8..b1294a2f14 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1107,7 +1107,7 @@ function extension_allowed($forum_id, $extension, &$extensions) * @param int $max_length Maximum length of string (multibyte character count as 1 char / Html entity count as 1 char) * @param int $max_store_length Maximum character length of string (multibyte character count as 1 char / Html entity count as entity chars). * @param bool $allow_reply Allow Re: in front of string -* NOTE: This parameter can cause undesired behavior (returning strings longer than $max_store_legnth) and is deprecated. +* NOTE: This parameter can cause undesired behavior (returning strings longer than $max_store_length) and is deprecated. * @param string $append String to be appended */ function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '') |