Fix timing of the addCIFunctions() call

Author: kenjis

libraries/Twig.php

@@ -27,6 +27,11 @@ class Twig
 		'form_open', 'form_close', 'form_error', 'set_value', 'form_hidden'
 	];
 
+	/**
+	 * @var bool Whether added CodeIgniter functions or not
+	 */
+	private $add_ci_functions = FALSE;
+
 	/**
 	 * @var Twig_Environment
 	 */
@@ -82,7 +87,6 @@ public function createTwig()
 		}
 
 		$this->twig = $twig;
-		$this->addCIFunctions();
 	}
 
 	public function setLoader($loader)
@@ -124,13 +128,22 @@ public function display($view, $params = [])
 	public function render($view, $params = [])
 	{
 		$this->createTwig();
+		// We call addCIFunctions() here, because we must call addCIFunctions()
+		// after loading CodeIgniter functions in a controller.
+		$this->addCIFunctions();
 
 		$view = $view . '.twig';
 		return $this->twig->render($view, $params);
 	}
 
 	private function addCIFunctions()
 	{
+		// Runs only once
+		if ($this->add_ci_functions)
+		{
+			return;
+		}
+
 		// as is functions
 		foreach ($this->functions_asis as $function)
 		{
@@ -171,6 +184,8 @@ private function addCIFunctions()
 				)
 			);
 		}
+
+		$this->add_ci_functions = TRUE;
 	}
 
 	/**

tests/libraries/TwigTest.php

@@ -43,4 +43,36 @@ public function testAddGlobal()
         $output = $obj->render('global');
         $this->assertEquals('<title>Twig Test Site</title>'."\n", $output);
     }
+
+    public function testAddCIFunctionsRunsOnlyOnce()
+    {
+        $obj = new Twig(['paths' => __DIR__ . '/../templates/']);
+        
+        $data = [
+            'name' => 'CodeIgniter',
+        ];
+
+        $ref_obj = new ReflectionObject($obj);
+        $ref_property = $ref_obj->getProperty('add_ci_functions');
+        $ref_property->setAccessible(true);
+        $add_ci_functions = $ref_property->getValue($obj);
+        $this->assertEquals(false, $add_ci_functions);
+
+        $output = $obj->render('welcome', $data);
+
+        $ref_obj = new ReflectionObject($obj);
+        $ref_property = $ref_obj->getProperty('add_ci_functions');
+        $ref_property->setAccessible(true);
+        $add_ci_functions = $ref_property->getValue($obj);
+        $this->assertEquals(true, $add_ci_functions);
+
+        // Calls render() twice
+        $output = $obj->render('welcome', $data);
+
+        $ref_obj = new ReflectionObject($obj);
+        $ref_property = $ref_obj->getProperty('add_ci_functions');
+        $ref_property->setAccessible(true);
+        $add_ci_functions = $ref_property->getValue($obj);
+        $this->assertEquals(true, $add_ci_functions);
+    }
 }