From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 25 Aug 2010 04:41:27 +0000 (-0600)
Subject: Revert "We expect an array back, so pass it an array."
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=55fe0e1abe03172043ea671e1fcd9216d213bd32;p=horde.git

Revert "We expect an array back, so pass it an array."

This reverts commit ab3d724ed9c4ef81741600076a87a66e891717cd.

We *do* get an array back when passing the variable name as a string,
and we avoid an unneeded compact() call.  And, more important, this
broke display of every mime driver.
---

diff --git a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
index fcc189ea4..61e7b210a 100644
--- a/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
+++ b/framework/Core/lib/Horde/Core/Factory/MimeViewer.php
@@ -240,7 +240,7 @@ class Horde_Core_Factory_MimeViewer
         }
 
         try {
-            $aconfig = Horde::loadConfiguration('mime_drivers.php', array('mime_drivers'), $app);
+            $aconfig = Horde::loadConfiguration('mime_drivers.php', 'mime_drivers', $app);
         } catch (Horde_Exception $e) {
             $aconfig = array();
         }