diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
| commit | e8e09039b49ac5883e9e94162579841375e13c69 (patch) | |
| tree | c206119bbc5bdcd573b56609b6450b14e6c20dcb /system/core/Utf8.php | |
| parent | 43c216b998ccf8c8208b237e9e0d9c468c8a82e5 (diff) | |
| parent | ae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (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) |