@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | if (!$this->renderingContext->isCacheEnabled()) { |
151 | 151 | return false; |
152 | 152 | } |
153 | -<<<<<<< HEAD |
|
153 | +<< << <<< HEAD |
|
154 | 154 | $identifier = $this->sanitizeIdentifier($identifier); |
155 | 155 | return !empty($identifier) && (class_exists($identifier, false) || $this->renderingContext->getCache()->get($identifier)); |
156 | 156 | ======= |
@@ -369,6 +369,4 @@ discard block |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |
@@ -369,6 +369,4 @@ |
||
369 | 369 | $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10); |
370 | 370 | } |
371 | 371 | $closure .= '}'; |
372 | - return $closure; |
|
373 | - } |
|
374 | -} |
|
372 | + return $closure |
|
375 | 373 | \ No newline at end of file |