Fix some factory/singleton usage.

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rar.php b/framework/Mime/lib/Horde/Mime/Viewer/rar.php
index b01e3f9..ed173d3 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/rar.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/rar.php
@@ -50,7 +50,7 @@ class Horde_Mime_Viewer_rar extends Horde_Mime_Viewer_Driver
         $contents = $this->_mimepart->getContents();
 
         require_once 'Horde/Compress.php';
-        $rar = &Horde_Compress::factory('rar');
+        $rar = &Horde_Compress::singleton('rar');
 
         $rarData = $rar->decompress($contents);
         if (is_a($rarData, 'PEAR_Error')) {

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/security.php b/framework/Mime/lib/Horde/Mime/Viewer/security.php
index c898eaa..c4b4f61 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/security.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/security.php
@@ -72,10 +72,10 @@ class Horde_Mime_Viewer_security extends Horde_Mime_Viewer_Driver
             if (empty($protocol)) {
                 return false;
             }
-            $viewer = &Horde_Mime_Viewer::factory($this->mime_part, $protocol);
+            $viewer = Horde_Mime_Viewer::factory($this->mime_part, $protocol);
             if (empty($viewer) ||
                 (String::lower(get_class($viewer)) == 'mime_viewer_default')) {
-                $viewer = &Horde_Mime_Viewer::factory($this->mime_part, $this->mime_part->getPrimaryType() . '/*');
+                $viewer = Horde_Mime_Viewer::factory($this->mime_part, $this->mime_part->getPrimaryType() . '/*');
                 if (empty($viewer)) {
                     return false;
                 }

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/zip.php b/framework/Mime/lib/Horde/Mime/Viewer/zip.php
index ef82421..3dd3685 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/zip.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/zip.php
@@ -39,7 +39,7 @@ class Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Driver
     {
         require_once 'Horde/Compress.php';
 
-        $zip = &Horde_Compress::factory('zip');
+        $zip = &Horde_Compress::singleton('zip');
 
         /* Make sure this is a valid zip file. */
         if ($zip->checkZipData($contents) === false) {