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

fixed globals when getGlobals is called early on (closes #990)

Browse Source
This commit is contained in:
Fabien Potencier
2013-02-08 18:01:47 +01:00
parent b699ea1e87
commit d13027d163
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+11 -6
View File
@@ -998,7 +998,7 @@ class Twig_Environment
{
if ($this->extensionInitialized || $this->runtimeInitialized) {
if (null === $this->globals) {
$this->initGlobals();
$this->globals = $this->initGlobals();
}
/* This condition must be uncommented in Twig 2.0
@@ -1023,8 +1023,12 @@ class Twig_Environment
*/
public function getGlobals()
{
if (null === $this->globals || !($this->runtimeInitialized || $this->extensionInitialized)) {
$this->initGlobals();
if (!$this->runtimeInitialized && !$this->extensionInitialized) {
return $this->initGlobals();
}
if (null === $this->globals) {
$this->globals = $this->initGlobals();
}
return $this->globals;
@@ -1094,11 +1098,12 @@ class Twig_Environment
protected function initGlobals()
{
$this->globals = array();
$globals = array();
foreach ($this->extensions as $extension) {
$this->globals = array_merge($this->globals, $extension->getGlobals());
$globals = array_merge($globals, $extension->getGlobals());
}
$this->globals = array_merge($this->globals, $this->staging->getGlobals());
return array_merge($globals, $this->staging->getGlobals());
}
protected function initExtensions()