geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-11 18:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cast $name to a string as $name can in fact be an object implementing __toString function as true in my case.

Browse Source
This commit is contained in:
Miha Vrhovnik
2012-01-17 19:22:20 +01:00
parent 3fbe8d8c46
commit 95f8af773e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Template.php
+5 -1
View File
@@ -98,6 +98,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function displayParentBlock($name, array $context, array $blocks = array())
{
$name = (string) $name;
if (isset($this->traits[$name])) {
$this->traits[$name][0]->displayBlock($name, $context, $blocks);
} elseif (false !== $parent = $this->getParent($context)) {
@@ -119,6 +121,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function displayBlock($name, array $context, array $blocks = array())
{
$name = (string) $name;
if (isset($blocks[$name])) {
$b = $blocks;
unset($b[$name]);
@@ -189,7 +193,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function hasBlock($name)
{
return isset($this->blocks[$name]);
return isset($this->blocks[(string) $name]);
}
/**