From a195690c2b3d64cb829525ef5615e78c64bd2582 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sat, 30 Jan 2010 18:49:06 -0700
Subject: [PATCH] Add Horde_Mime autoloader callback

---
 .../Core/lib/Horde/Core/Autoloader/Callback/Mime.php      | 15 +++++++++++++++
 framework/Core/lib/Horde/Registry.php                     |  3 +++
 framework/Core/package.xml                                |  6 ++++++
 imp/lib/Application.php                                   |  5 +----
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 framework/Core/lib/Horde/Core/Autoloader/Callback/Mime.php

diff --git a/framework/Core/lib/Horde/Core/Autoloader/Callback/Mime.php b/framework/Core/lib/Horde/Core/Autoloader/Callback/Mime.php
new file mode 100644
index 000000000..540e79cf7
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Autoloader/Callback/Mime.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * TODO
+ */
+class Horde_Core_Autoloader_Callback_Mime
+{
+    /**
+     * TODO
+     */
+    public function callback()
+    {
+        Horde_Mime::$brokenRFC2231 = !empty($GLOBALS['conf']['mailformat']['brokenrfc2231']);
+    }
+
+}
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 4d685d2cf..457d0ebc6 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -229,6 +229,9 @@ class Horde_Registry
      */
     protected function __construct($session_flags = 0)
     {
+        /* Set autoloader callbacks. */
+        Horde_Autoloader::addCallback('Horde_Mime', array('Horde_Core_Autoloader_Callback_Mime', 'callback'));
+
         /* Import and global Horde's configuration values. Almost a chicken
          * and egg issue - since loadConfiguration() uses registry in certain
          * instances. However, if HORDE_BASE is defined, and app is
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index bea5bf497..d3b7c7ffe 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -50,6 +50,11 @@ Application Framework.
     <dir name="Horde">
      <file name="Config.php" role="php" />
      <dir name="Core">
+      <dir name="Autoloader">
+       <dir name="Callback">
+        <dir name="Mime.php" role="php" />
+       </dir>
+      </dir>
       <dir name="Binder">
        <file name="Cache.php" role="php" />
        <file name="Db.php" role="php" />
@@ -140,6 +145,7 @@ Application Framework.
  <phprelease>
   <filelist>
    <install name="lib/Horde/Config.php" as="Horde/Config.php" />
+   <install name="lib/Horde/Core/Autoloader/Callback/Mime.php" as="Horde/Core/Autoloader/Callback/Mime.php" />
    <install name="lib/Horde/Core/Binder/Cache.php" as="Horde/Core/Binder/Cache.php" />
    <install name="lib/Horde/Core/Binder/Db.php" as="Horde/Core/Binder/Db.php" />
    <install name="lib/Horde/Core/Binder/Logger.php" as="Horde/Core/Binder/Logger.php" />
diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index ad9a62215..a897af146 100644
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -106,10 +106,7 @@ class IMP_Application extends Horde_Registry_Application
             $GLOBALS['imp_imap'] = new IMP_Imap();
         }
 
-        // Initialize some message parsing variables.
-        Horde_Mime::$brokenRFC2231 = !empty($GLOBALS['conf']['mailformat']['brokenrfc2231']);
-
-        // Set default message character set, if necessary
+        // Set default message character set.
         if ($def_charset = $GLOBALS['prefs']->getValue('default_msg_charset')) {
             Horde_Mime_Part::$defaultCharset = $def_charset;
             Horde_Mime_Headers::$defaultCharset = $def_charset;
-- 
2.11.0