Merge branch 'release'

zendframework · Sep 13, 2012 · b09399b · b09399b
commit b09399b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/Escaper.php b/src/Escaper.php
@@ -269,9 +269,8 @@ protected function htmlAttrMatcher($matches)
          */
         if ($ord > 255) {
             return sprintf('&#x%04X;', $ord);
-        } else {
-            return sprintf('&#x%02X;', $ord);
         }
+        return sprintf('&#x%02X;', $ord);
     }
 
     /**
@@ -286,10 +285,9 @@ protected function jsMatcher($matches)
         $chr = $matches[0];
         if (strlen($chr) == 1) {
             return sprintf('\\x%02X', ord($chr));
-        } else {
-            $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-            return sprintf('\\u%04s', strtoupper(bin2hex($chr)));
         }
+        $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
+        return sprintf('\\u%04s', strtoupper(bin2hex($chr)));
     }
 
     /**
@@ -389,8 +387,7 @@ protected function convertEncoding($string, $to, $from)
 
         if ($result === false) {
             return ''; // return non-fatal blank string on encoding errors from users
-        } else {
-            return $result;
         }
+        return $result;
     }
 }