From: Jan Schneider <jan@horde.org>
Date: Thu, 11 Nov 2010 14:19:01 +0000 (+0100)
Subject: Convert all latin charsets.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=02def08ee70d698aad917a2bb9d014d67f5bbdbd;p=horde.git

Convert all latin charsets.
---

diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
index 0b18c31c6..005ce3409 100644
--- a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
@@ -159,10 +159,7 @@ class Horde_Db_Adapter_Mysql_Schema extends Horde_Db_Adapter_Base_Schema
      */
     public function _mysqlCharsetName($charset)
     {
-        $charset = strtolower(preg_replace('/[^a-zA-Z0-9]/', '', $charset));
-        if ($charset == 'iso88591') {
-            $charset = 'latin1';
-        }
+        $charset = strtolower(preg_replace(array('/[^a-zA-Z0-9]/', '/iso8859(\d)/'), array('', 'latin$1'), $charset));
         $validCharsets = $this->selectValues('SHOW CHARACTER SET');
         if (!in_array($charset, $validCharsets)) {
             throw new Horde_Db_Exception($charset . ' is not supported by MySQL');