summaryrefslogtreecommitdiffstats
path: root/system/core/Utf8.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-17 14:53:07 +0200
commit0ab28ced4d4f20d5857fae9ec0e20452d4ac181b (patch)
treefae554725bd9b187f9b298e5702f951ac394a6d7 /system/core/Utf8.php
parentd013c63462b4eaa2ac2f684b2ad498a9c4fb7dd5 (diff)
parente30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff)
merge upstream
Diffstat (limited to 'system/core/Utf8.php')
-rw-r--r--system/core/Utf8.php4
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)