diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-25 18:02:37 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-01-25 18:02:37 +0000 |
| commit | 4eda4855efa2392226f9267b25094402886a64d2 (patch) | |
| tree | cfe3862fd8e01845744030bf21e5306f3cf22fe9 | |
| parent | 7a1b507fa65bc7554ee4d65fae687a80bb8aea66 (diff) | |
| download | forums-4eda4855efa2392226f9267b25094402886a64d2.tar forums-4eda4855efa2392226f9267b25094402886a64d2.tar.gz forums-4eda4855efa2392226f9267b25094402886a64d2.tar.bz2 forums-4eda4855efa2392226f9267b25094402886a64d2.tar.xz forums-4eda4855efa2392226f9267b25094402886a64d2.zip | |
Deprecate $allow_reply parameter to truncate_string() (Bug #56675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index cca6bc05bc..3a5ca1bedf 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -145,6 +145,7 @@ <li>[Fix] Replace hard coded "px" with translated language-string. (Bug #52495)</li> <li>[Fix] Correctly hover list menu in UCP and MCP for rtl languages. (Bug #49945)</li> <li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li> + <li>[Fix] Deprecate $allow_reply parameter to truncate_string() (Bug #56675)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c265d0ae41..faff9dd0de 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1106,10 +1106,11 @@ function extension_allowed($forum_id, $extension, &$extensions) * @param string $string The text to truncate to the given length. String is specialchared. * @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 +* @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. * @param string $append String to be appended */ -function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = true, $append = '') +function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '') { $chars = array(); |