|
@@ -593,7 +593,7 @@ discard block |
|
|
block discarded – undo |
|
593
|
593
|
return $this->templateSource = stream_get_contents($this->templateSource); |
|
594
|
594
|
} |
|
595
|
595
|
$templateReference = $this->resolveTemplateFileForControllerAndActionAndFormat($controller, $action); |
|
596
|
|
- if (!file_exists((string)$templateReference) && $templateReference !== 'php://stdin') { |
|
|
596
|
+ if (!file_exists((string) $templateReference) && $templateReference !== 'php://stdin') { |
|
597
|
597
|
$format = $this->getFormat(); |
|
598
|
598
|
throw new InvalidTemplateResourceException( |
|
599
|
599
|
sprintf( |
|
@@ -622,7 +622,7 @@ discard block |
|
|
block discarded – undo |
|
622
|
622
|
*/ |
|
623
|
623
|
protected function createIdentifierForFile($pathAndFilename, $prefix) |
|
624
|
624
|
{ |
|
625
|
|
- $pathAndFilename = (string)$pathAndFilename; |
|
|
625
|
+ $pathAndFilename = (string) $pathAndFilename; |
|
626
|
626
|
$templateModifiedTimestamp = $pathAndFilename !== 'php://stdin' && file_exists($pathAndFilename) ? filemtime($pathAndFilename) : 0; |
|
627
|
627
|
return sprintf('%s_%s', $prefix, sha1($pathAndFilename . '|' . $templateModifiedTimestamp)); |
|
628
|
628
|
} |
Please login to merge, or discard this patch.