[2.4] Hotfix - isExpired correct file path

[michalbundyra]

Method was called from getContent with the full file path (see lines 36 and 43) and inside the method isExpired baseDir was added another time (see line 57), so as the result we have: "baseDir/baseDir/fileName.ext"

latte/src/Latte/Loaders/FileLoader.php

Lines 34 to 43 in e6ab6cc

	public function getContent($file)
	{
	$file = $this->baseDir . $file;
	if ($this->baseDir && !Latte\Helpers::startsWith($this->normalizePath($file), $this->baseDir)) {
	throw new \RuntimeException("Template '$file' is not within the allowed path '$this->baseDir'.");
	} elseif (!is_file($file)) {
	throw new \RuntimeException("Missing template file '$file'.");
	} elseif ($this->isExpired($file, time())) {

latte/src/Latte/Loaders/FileLoader.php

Lines 55 to 57 in e6ab6cc

	public function isExpired($file, $time)
	{
	return @filemtime($this->baseDir . $file) > $time; // @ - stat may fail

Fix for 2.4 branch, but it should be also fixed on master.

• bug fix? yes/no
• new feature? yes/no
• BC break? yes/no
• doc PR: nette/docs#???

[dg]

Thanks!