From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 28 May 2010 18:20:31 +0000 (-0400)
Subject: Need to pass 'charset' parameter to alarms
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9f475d750afdbed0291ab2b2cf0dc7c5c9321c05;p=horde.git

Need to pass 'charset' parameter to alarms

Add a getConfig method to the Core Horde_Db factory for getting the db config
for the specified module, use it to get the charset parameter to pass to alarms.
---

diff --git a/framework/Core/lib/Horde/Core/Binder/Alarm.php b/framework/Core/lib/Horde/Core/Binder/Alarm.php
index 2f0eb16e9..49f204ed7 100644
--- a/framework/Core/lib/Horde/Core/Binder/Alarm.php
+++ b/framework/Core/lib/Horde/Core/Binder/Alarm.php
@@ -14,6 +14,8 @@ class Horde_Core_Binder_Alarm implements Horde_Injector_Binder
 
         if (strcasecmp($driver, 'Sql') === 0) {
             $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'alarm');
+            $config = $injector->getInstance('Horde_Db')->getConfig('alarm');
+            $params['charset'] = $config['charset'];
         }
 
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');
diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index 3c4281d45..2cbf684f4 100644
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -102,6 +102,13 @@ class Horde_Core_Factory_Db
 
     /**
      */
+    public function getConfig($type)
+    {
+        return Horde::getDriverConfig($type, 'sql');
+    }
+
+    /**
+     */
     protected function _createDb($config)
     {
         if (!empty($config['splitread'])) {