From 2f8b1036da42ec3d15a51c6b17a473f9f4df71d3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sat, 07 Feb 2015 12:33:24 -0500
Subject: [PATCH] Bump version and copyright year
---
program/lib/Roundcube/rcube_charset.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index 3e2dac1..3657626 100644
--- a/program/lib/Roundcube/rcube_charset.php
+++ b/program/lib/Roundcube/rcube_charset.php
@@ -175,7 +175,6 @@
static $iconv_options = null;
static $mbstring_list = null;
static $mbstring_sch = null;
- static $conv = null;
$to = empty($to) ? RCUBE_CHARSET : $to;
$from = self::parse_charset($from);
@@ -274,7 +273,7 @@
return utf8_encode($str);
}
else {
- user_error("No suitable function found for UTF-8 encoding", E_USER_WARNING);
+ trigger_error("No suitable function found for UTF-8 encoding");
}
}
@@ -290,7 +289,7 @@
return utf8_decode($str);
}
else {
- user_error("No suitable function found for UTF-8 decoding", E_USER_WARNING);
+ trigger_error("No suitable function found for UTF-8 decoding");
}
}
--
Gitblit v1.9.1