Corrected bug #578, where underscore characters were being stripped from template names when using a custom resource

This commit is contained in:
Scott Newton
2020-04-13 10:06:32 -04:00
parent 17d4d43624
commit 951c7a4d86

View File

@@ -47,7 +47,7 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
*/ */
public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
{ {
$source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25); $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9._]/', '', $source->name), 0, 25);
$source->uid = sha1($source->type . ':' . $source->name); $source->uid = sha1($source->type . ':' . $source->name);
$mtime = $this->fetchTimestamp($source->name); $mtime = $this->fetchTimestamp($source->name);
if ($mtime !== null) { if ($mtime !== null) {
@@ -88,6 +88,6 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource
*/ */
public function getBasename(Smarty_Template_Source $source) public function getBasename(Smarty_Template_Source $source)
{ {
return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25)); return basename(substr(preg_replace('/[^A-Za-z0-9._]/', '', $source->name), 0, 25));
} }
} }