diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:34:17 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:34:17 +0100 |
commit | 407219ddff7e11516c7f295ee3e07c31ba3fe9ee (patch) | |
tree | 55f910d2f6d57f6436f28b7ce06666d77f41d6bc /system/libraries/Trackback.php | |
parent | 99f31cd1a487d209fd9632b40baf12406bd897c1 (diff) | |
parent | 820999cb0d82c80d6dc5dde133568812c8113e29 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-zip
Diffstat (limited to 'system/libraries/Trackback.php')
-rw-r--r-- | system/libraries/Trackback.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php index 79a009133..be1de6f3f 100644 --- a/system/libraries/Trackback.php +++ b/system/libraries/Trackback.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -141,7 +141,7 @@ class CI_Trackback { $this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset'])); - if ($val != 'url' && function_exists('mb_convert_encoding')) + if ($val != 'url' && MB_ENABLED === TRUE) { $_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']); } |