From 3d4ba6280810ce4267809177bdc4a3e462b32e5e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 19 Jun 2009 13:06:31 -0400
Subject: [PATCH] Fix link text replacements (#1485789)
---
program/lib/utf8.class.php | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index c0bd0a7..2bbe636 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -50,7 +50,15 @@
"ISO-8859-1" => UTF8_MAP_DIR . "/ISO-8859-1.map",
"ISO-8859-2" => UTF8_MAP_DIR . "/ISO-8859-2.map",
"ISO-8859-3" => UTF8_MAP_DIR . "/ISO-8859-3.map",
- "ISO-8859-4" => UTF8_MAP_DIR . "/ISO-8859-4.map");
+ "ISO-8859-4" => UTF8_MAP_DIR . "/ISO-8859-4.map",
+ "ISO-8859-5" => UTF8_MAP_DIR . "/ISO-8859-5.map",
+ "ISO-8859-6" => UTF8_MAP_DIR . "/ISO-8859-6.map",
+ "ISO-8859-7" => UTF8_MAP_DIR . "/ISO-8859-7.map",
+ "ISO-8859-8" => UTF8_MAP_DIR . "/ISO-8859-8.map",
+ "ISO-8859-9" => UTF8_MAP_DIR . "/ISO-8859-9.map",
+ "KOI8-R" => UTF8_MAP_DIR . "/KOI8R.map",
+ "KOI8R" => UTF8_MAP_DIR . "/KOI8R.map"
+ );
//Error constants
define("ERR_OPEN_MAP_FILE","ERR_OPEN_MAP_FILE");
@@ -62,16 +70,10 @@
var $ascMap = array();
var $utfMap = array();
- // made PHP5 capable by RoundCube
function __construct($charset="ISO-8859-1"){
$this->loadCharset($charset);
}
- //Constructor
- function utf8($charset="ISO-8859-1"){
- $this->__construct($charset);
- }
-
//Load charset
function loadCharset($charset){
global $utf8_maps;
@@ -106,6 +108,7 @@
function onError($err_code,$err_text){
//print($err_code . " : " . $err_text . "<hr>\n");
raise_error(array('code' => 500,
+ 'type' => 'php',
'file' => __FILE__,
'message' => $err_text), TRUE, FALSE);
}
@@ -171,4 +174,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1