diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
| commit | 55450deee2acbdf112f5c206673b3215ca10dfcb (patch) | |
| tree | 09fa0f810524ed353f868194059f336c6f26eb50 /system/core/Utf8.php | |
| parent | 351c2e1b0d3fdca80a5483d708d7c71084226e68 (diff) | |
| parent | e30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff) | |
merge upstream
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) |