Merge branch 'master' of https://github.com/Yousha/zf2 into release

zendframework · Sep 13, 2012 · 3a37ce6 · 3a37ce6
commit 3a37ce6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Part.php b/src/Part.php
@@ -124,9 +124,8 @@ public function getContent($EOL = Mime::LINEEND)
     {
         if ($this->isStream) {
             return stream_get_contents($this->getEncodedStream());
-        } else {
-            return Mime::encode($this->content, $this->encoding, $EOL);
         }
+        return Mime::encode($this->content, $this->encoding, $EOL);
     }
 
     /**
@@ -137,9 +136,8 @@ public function getRawContent()
     {
         if ($this->isStream) {
             return stream_get_contents($this->content);
-        } else {
-            return $this->content;
         }
+        return $this->content;
     }
 
     /**