From 55fe0e1abe03172043ea671e1fcd9216d213bd32 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 24 Aug 2010 22:41:27 -0600 Subject: [PATCH] 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. --- framework/Core/lib/Horde/Core/Factory/MimeViewer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); } -- 2.11.0