From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 13 Jul 2009 20:20:56 +0000 (-0600)
Subject: No reference from singletons
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4838ce842a010402f1d0ba8031393fc0a6c2a595;p=horde.git

No reference from singletons
---

diff --git a/framework/Mime/lib/Horde/Mime/Mdn.php b/framework/Mime/lib/Horde/Mime/Mdn.php
index 146146034..c11cb7a2d 100644
--- a/framework/Mime/lib/Horde/Mime/Mdn.php
+++ b/framework/Mime/lib/Horde/Mime/Mdn.php
@@ -146,7 +146,7 @@ class Horde_Mime_Mdn
         require_once 'Horde/Identity.php';
 
         /* Set up some variables we use later. */
-        $identity = &Identity::singleton();
+        $identity = Identity::singleton();
         $from_addr = $identity->getDefaultFromAddress();
 
         $to = $this->getMdnReturnAddr();
diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php b/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php
index 4d4cdaf5e..dbe39a9e1 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Ooo.php
@@ -49,7 +49,7 @@ class Horde_Mime_Viewer_Ooo extends Horde_Mime_Viewer_Driver
             'table:number-columns-spanned=' => 'colspan='
         );
 
-        $zip = &Horde_Compress::singleton('zip');
+        $zip = Horde_Compress::singleton('zip');
         $list = $zip->decompress($this->_mimepart->getContents(), array('action' => HORDE_COMPRESS_ZIP_LIST));
 
         foreach ($list as $key => $file) {
diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php
index d98cb8a64..798a4d465 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php
@@ -51,7 +51,7 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver
     {
         $contents = $this->_mimepart->getContents();
 
-        $rar = &Horde_Compress::singleton('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/Tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php
index 139284b50..549508847 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php
@@ -52,7 +52,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver
 
         /* Decompress gzipped files. */
         if (in_array($subtype, $this->_gzipSubtypes)) {
-            $gzip = &Horde_Compress::singleton('gzip');
+            $gzip = Horde_Compress::singleton('gzip');
             $contents = $gzip->decompress($contents);
             if (is_a($contents, 'PEAR_Error') || empty($contents)) {
                 return array();
@@ -60,7 +60,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver
         }
 
         /* Obtain the list of files/data in the tar file. */
-        $tar = &Horde_Compress::singleton('tar');
+        $tar = Horde_Compress::singleton('tar');
         $tarData = $tar->decompress($contents);
         if (is_a($tarData, 'PEAR_Error')) {
             return array();
diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php b/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php
index ad768e1f9..e7f043164 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Tnef.php
@@ -49,7 +49,7 @@ class Horde_Mime_Viewer_Tnef extends Horde_Mime_Viewer_Driver
      */
     protected function _renderInline()
     {
-        $tnef = &Horde_Compress::singleton('tnef');
+        $tnef = Horde_Compress::singleton('tnef');
 
         $data = '<table border="1">';
         $info = $tnef->decompress($this->_mimepart->getContents());
diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php
index 426f1b49f..d9637a80e 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php
@@ -68,7 +68,7 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver
     {
         $contents = $this->_mimepart->getContents();
 
-        $zip = &Horde_Compress::singleton('zip');
+        $zip = Horde_Compress::singleton('zip');
 
         /* Make sure this is a valid zip file. */
         if ($zip->checkZipData($contents) === false) {