aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-08-04 23:07:06 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-08-04 23:07:06 -0400
commitec3f4db4254783a8542da5ed479949cee7a98454 (patch)
tree1862ccc2d4424b506ee2621481e39c4d6a06115a
parent66867b5ac0de96a8072d81108d70c08cea77180e (diff)
parent08ca84a3e7fe7f8aa837792be9f3a55e62f77345 (diff)
downloadforums-ec3f4db4254783a8542da5ed479949cee7a98454.tar
forums-ec3f4db4254783a8542da5ed479949cee7a98454.tar.gz
forums-ec3f4db4254783a8542da5ed479949cee7a98454.tar.bz2
forums-ec3f4db4254783a8542da5ed479949cee7a98454.tar.xz
forums-ec3f4db4254783a8542da5ed479949cee7a98454.zip
Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympus
* bantu/ticket/10299: [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
-rw-r--r--phpBB/includes/functions_content.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index faff9dd0de..b7650ecd6a 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 = '')