merged branch francisbesset/fixed_refresh_template (PR #2725)

fabpot · fabpot · commit 2e8fe92fa531 · 2011-11-27T14:49:34.000+01:00
Commits ------- 17dc605 [FrameworkBundle] Checks that the template is readable before checking its modification time Discussion ---------- Fixed bug to refresh templates deleted Checks that the template is readable before checking its modification time.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
@@ -65,6 +65,10 @@ public function isFresh(TemplateReferenceInterface $template, $time)
             return false;
         }
 
+        if (!is_readable((string) $storage)) {
+            return false;
+        }
+
         return filemtime((string) $storage) < $time;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public function isFresh(TemplateReferenceInterface $template, $time)`
`65`	`65`	`return false;`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ if (!is_readable((string) $storage)) {`
	`69`	`+ return false;`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`return filemtime((string) $storage) < $time;`
`69`	`73`	`}`
`70`	`74`	`}`