Merge remote branch 'udat/small-fixes' into 4.1

* udat/small-fixes: Removed unnecessary return statements Removed unused arguments [typo] Fixed type in Swift_FileSpool
swiftmailer · Mar 13, 2011 · ad9f90f · ad9f90f
2 parents 87c3dcf + c8c3d81
commit ad9f90f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -77,7 +77,7 @@ public function getFieldBodyModel()
    */
   public function setId($id)
   {
-    return $this->setIds(array($id));
+    $this->setIds(array($id));
   }
 
   /**

diff --git a/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -167,7 +167,7 @@ public function getNameAddresses()
    */
   public function setAddresses($addresses)
   {
-    return $this->setNameAddresses(array_values((array) $addresses));
+    $this->setNameAddresses(array_values((array) $addresses));
   }
 
   /**

diff --git a/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -99,7 +99,7 @@ public function getFieldBody()
     {
       $this->setCachedValue(
         str_replace('\\', '\\\\', $this->encodeWords(
-          $this, $this->_value, -1, $this->getCharset(), $this->getEncoder()
+          $this, $this->_value
           ))
         );
     }