From 9870dac30de1b8d1bdeab57af3eeb7c89b21ef76 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 14 Apr 2012 02:35:52 -0400
Subject: [PATCH] - Make some methods public (#1488428)
---
program/include/rcube_charset.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index 29de426..7e8fe49 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -8,7 +8,10 @@
| Copyright (C) 2005-2012, The Roundcube Dev Team |
| Copyright (C) 2011-2012, Kolab Systems AG |
| Copyright (C) 2000 Edmund Grimley Evans <edmundo@rano.org> |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Provide charset conversion functionality |
@@ -75,7 +78,7 @@
* @param int Level of the error
* @param string Error message
*/
- public function error_handler($errno, $errstr)
+ public static function error_handler($errno, $errstr)
{
throw new ErrorException($errstr, 0, $errno);
}
@@ -269,7 +272,7 @@
if ($from == 'UTF-8') {
// @TODO: we need a function for UTF-7 (RFC2152) conversion
if ($to == 'UTF7-IMAP' || $to == 'UTF-7') {
- if ($_str = utf8_to_utf7imap($str)) {
+ if ($_str = self::utf8_to_utf7imap($str)) {
return $_str;
}
}
--
Gitblit v1.9.1