X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FTemplateParser.php;h=2759ff9baa8d9b91240e061dd9939916324f3c85;hb=3f849d695fb311a1ec0367715311a80de530117a;hp=924c347aa53f537b19e714e8a241cc64c13fc0d3;hpb=4f9d78c64942584d12d0ca3fb7f3de417f663408;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 924c347aa5..2759ff9baa 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -102,20 +102,22 @@ class TemplateParser {
 			$key = $cache->makeKey( 'template', $templateName, $fastHash );
 			$code = $this->forceRecompile ? null : $cache->get( $key );
 
-			if ( !$code ) {
-				$code = $this->compileForEval( $fileContents, $filename );
-
-				// Prefix the cached code with a keyed hash (64 hex chars) as an integrity check
-				$cache->set( $key, hash_hmac( 'sha256', $code, $secretKey ) . $code );
-			} else {
+			if ( $code ) {
 				// Verify the integrity of the cached PHP code
 				$keyedHash = substr( $code, 0, 64 );
 				$code = substr( $code, 64 );
 				if ( $keyedHash !== hash_hmac( 'sha256', $code, $secretKey ) ) {
-					// Generate a notice if integrity check fails
-					trigger_error( "Template failed integrity check: {$filename}" );
+					// If the integrity check fails, don't use the cached code
+					// We'll update the invalid cache below
+					$code = null;
 				}
 			}
+			if ( !$code ) {
+				$code = $this->compileForEval( $fileContents, $filename );
+
+				// Prefix the cached code with a keyed hash (64 hex chars) as an integrity check
+				$cache->set( $key, hash_hmac( 'sha256', $code, $secretKey ) . $code );
+			}
 		// If there is no secret key available, don't use cache
 		} else {
 			$code = $this->compileForEval( $fileContents, $filename );