fixed dump function is_safe value when html_errors is not defined in …

…php.ini (closes #720)
twigphp · May 8, 2012 · 078905e · 078905e
1 parent 9252548
commit 078905e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/Twig/Extension/Debug.php b/lib/Twig/Extension/Debug.php
@@ -18,7 +18,13 @@ class Twig_Extension_Debug extends Twig_Extension
     public function getFunctions()
     {
         // dump is safe if var_dump is overriden by xdebug
-        $isDumpOutputHtmlSafe = extension_loaded('xdebug') && (false === get_cfg_var('xdebug.overload_var_dump') || get_cfg_var('xdebug.overload_var_dump')) && get_cfg_var('html_errors');
+        $isDumpOutputHtmlSafe = extension_loaded('xdebug')
+            // false means that it was not set (and the default is on) or it explicitly enabled
+            && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump'))
+            // false means that it was not set (and the default is on) or it explicitly enabled
+            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
+            && (false === ini_get('html_errors') || ini_get('html_errors'))
+        ;
 
         return array(
             'dump' => new Twig_Function_Function('twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),