Просмотр исходного кода

Normalize control structures

Let's avoid mixing 'continue' and 'if/else': let's always use 'if/else'
Michele Locati 11 лет назад
Родитель
Сommit
850df02e3c
1 измененных файлов с 10 добавлено и 14 удалено
  1. 10 14
      library/Zend/Locale/Format.php

+ 10 - 14
library/Zend/Locale/Format.php

@@ -767,28 +767,24 @@ class Zend_Locale_Format
         foreach (str_split($format) as $char) {
             if (!$escaped && $char == '\\') {
                 $escaped = true;
-                continue;
-            }
-            if ($escaped) {
+            } elseif ($escaped) {
                 if (!$lastescaped) {
                     $converted[] = "'";
                     $lastescaped = true;
                 }
                 $converted[] = $char;
                 $escaped = false;
+            } elseif ($char == "'") {
+                $converted[] = "''";
             } else {
-                if ($char == "'") {
-                    $converted[] = "''";
+                if ($lastescaped) {
+                    $converted[] = "'";
+                    $lastescaped = false;
+                }
+                if (isset($convert[$char]) === true) {
+                    $converted[] = $convert[$char];
                 } else {
-                    if ($lastescaped) {
-                        $converted[] = "'";
-                        $lastescaped = false;
-                    }
-                    if (isset($convert[$char]) === true) {
-                        $converted[] = $convert[$char];
-                    } else {
-                        $converted[] = $char;
-                    }
+                    $converted[] = $char;
                 }
             }
         }