Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Aug 13, 2012 · 49269e7 · 49269e7
3 parents 9f06d58 + d3fd832 + 55daa98
commit 49269e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Mime.php b/src/Mime.php
@@ -189,30 +189,30 @@ public static function encodeQuotedPrintableHeader($str, $charset,
 
         // Split encoded text into separate lines
         $tmp = "";
-        while(strlen($str) > 0) {
+        while (strlen($str) > 0) {
             $currentLine = max(count($lines)-1, 0);
             $token       = self::getNextQuotedPrintableToken($str);
             $str         = substr($str, strlen($token));
 
             $tmp .= $token;
-            if($token == '=20') {
+            if ($token == '=20') {
                 // only if we have a single char token or space, we can append the
                 // tempstring it to the current line or start a new line if necessary.
-                if(strlen($lines[$currentLine].$tmp) > $lineLength) {
+                if (strlen($lines[$currentLine].$tmp) > $lineLength) {
                     $lines[$currentLine+1] = $tmp;
                 } else {
                     $lines[$currentLine] .= $tmp;
                 }
                 $tmp = "";
             }
             // don't forget to append the rest to the last line
-            if(strlen($str) == 0) {
+            if (strlen($str) == 0) {
                 $lines[$currentLine] .= $tmp;
             }
         }
 
         // assemble the lines together by pre- and appending delimiters, charset, encoding.
-        for($i = 0; $i < count($lines); $i++) {
+        for ($i = 0; $i < count($lines); $i++) {
             $lines[$i] = " ".$prefix.$lines[$i]."?=";
         }
         $str = trim(implode($lineEnd, $lines));
@@ -227,7 +227,7 @@ public static function encodeQuotedPrintableHeader($str, $charset,
      */
     private static function getNextQuotedPrintableToken($str)
     {
-        if(substr($str, 0, 1) == "=") {
+        if (substr($str, 0, 1) == "=") {
             $token = substr($str, 0, 3);
         } else {
             $token = substr($str, 0, 1);

diff --git a/src/Part.php b/src/Part.php
@@ -187,7 +187,7 @@ public function getHeadersArray($EOL = Mime::LINEEND)
             $headers[] = array('Content-Location', $this->location);
         }
 
-        if ($this->language){
+        if ($this->language) {
             $headers[] = array('Content-Language', $this->language);
         }