@@ -36,8 +36,7 @@ |
||
36 | 36 | if($var->isValid()) |
37 | 37 | { |
38 | 38 | $this->valueToken = $var->getToken(); |
39 | - } |
|
40 | - else |
|
39 | + } else |
|
41 | 40 | { |
42 | 41 | $this->validationResult->makeError( |
43 | 42 | t('No variable has been specified.'), |
@@ -44,8 +44,7 @@ discard block |
||
44 | 44 | if(in_array($var->getSign(), $this->getAllowedOperands())) |
45 | 45 | { |
46 | 46 | $this->operandToken = $var->getToken(); |
47 | - } |
|
48 | - else |
|
47 | + } else |
|
49 | 48 | { |
50 | 49 | $this->validationResult->makeError( |
51 | 50 | t('Invalid operand %1$s.', $var->getSign()).' '. |
@@ -54,8 +53,7 @@ discard block |
||
54 | 53 | Mailcode_Commands_CommonConstants::VALIDATION_INVALID_OPERAND |
55 | 54 | ); |
56 | 55 | } |
57 | - } |
|
58 | - else |
|
56 | + } else |
|
59 | 57 | { |
60 | 58 | $this->validationResult->makeError( |
61 | 59 | t('No operand has been specified.'), |
@@ -36,8 +36,7 @@ |
||
36 | 36 | if($var->isValid()) |
37 | 37 | { |
38 | 38 | $this->variableToken = $var->getToken(); |
39 | - } |
|
40 | - else |
|
39 | + } else |
|
41 | 40 | { |
42 | 41 | $this->validationResult->makeError( |
43 | 42 | t('No variable has been specified.'), |
@@ -119,8 +119,7 @@ |
||
119 | 119 | if($closing) |
120 | 120 | { |
121 | 121 | array_pop($stack); |
122 | - } |
|
123 | - else |
|
122 | + } else |
|
124 | 123 | { |
125 | 124 | $stack[] = $tagName; |
126 | 125 | } |
@@ -282,17 +282,14 @@ |
||
282 | 282 | { |
283 | 283 | $replaces[$formattedNeedle] = $placeholder->getHighlightedText(); |
284 | 284 | $replace = $placeholder->getNormalizedText(); |
285 | - } |
|
286 | - else |
|
285 | + } else |
|
287 | 286 | { |
288 | 287 | $replace = $placeholder->getHighlightedText(); |
289 | 288 | } |
290 | - } |
|
291 | - else if($normalize) |
|
289 | + } else if($normalize) |
|
292 | 290 | { |
293 | 291 | $replace = $placeholder->getNormalizedText(); |
294 | - } |
|
295 | - else |
|
292 | + } else |
|
296 | 293 | { |
297 | 294 | $replace = $placeholder->getOriginalText(); |
298 | 295 | } |