mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

More on bugtracker #4457 - CHARSET could be upper case

Browse Source
This commit is contained in:
e107steved
2008-07-17 19:17:54 +00:00
parent 6ab6635a2f
commit f44af2bebc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/e_parse_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
| $Revision: 1.35 $ | $Revision: 1.36 $
| $Date: 2008-07-15 21:18:27 $ | $Date: 2008-07-17 19:17:44 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -233,7 +233,7 @@ class e_parse
$lbrks = "/?!%)-}]\\\"':;&"; $lbrks = "/?!%)-}]\\\"':;&";
// Is $str a UTF8 string? // Is $str a UTF8 string?
$utf8 = ($utf || CHARSET == 'utf-8') ? "u" : ""; $utf8 = ($utf || strtolower(CHARSET) == 'utf-8') ? "u" : "";
// Start of the serious stuff - split into HTML tags and text between // Start of the serious stuff - split into HTML tags and text between
@@ -427,7 +427,7 @@ class e_parse
function text_truncate($text, $len = 200, $more = "[more]") function text_truncate($text, $len = 200, $more = "[more]")
{ {
if (strlen($text) <= $len) return $text; // Always valid if (strlen($text) <= $len) return $text; // Always valid
if (CHARSET !== 'utf-8') if (strtolower(CHARSET) !== 'utf-8')
{ {
$ret = substr($text,0,$len); // Non-utf-8 - one byte per character - simple (unless there's an entity involved) $ret = substr($text,0,$len); // Non-utf-8 - one byte per character - simple (unless there's an entity involved)
} }