diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-05-17 14:29:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-05-17 14:29:35 +0200 |
| commit | 49d08053257b55db511eaca08b8ab5d12149f3b6 (patch) | |
| tree | 57a0f89d690cb4c9331552d7836cc57ccc007ad8 /system/core/Utf8.php | |
| parent | 14aa3178e12f285bed006511902e50aaae69bada (diff) | |
| parent | ae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-dh-date-range
Diffstat (limited to 'system/core/Utf8.php')
| -rw-r--r-- | system/core/Utf8.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/core/Utf8.php b/system/core/Utf8.php index 122020aea..a6faa84ec 100644 --- a/system/core/Utf8.php +++ b/system/core/Utf8.php @@ -42,6 +42,8 @@ class CI_Utf8 { * Constructor * * Determines if UTF-8 support is to be enabled + * + * @return void */ public function __construct() { @@ -124,7 +126,7 @@ class CI_Utf8 { * Attempts to convert a string to UTF-8 * * @param string - * @param string - input encoding + * @param string input encoding * @return string */ public function convert_to_utf8($str, $encoding) |