Merge branch 'template'

local/modules/DebugBar/DataCollector/PropelCollector.php

@@ -66,8 +66,8 @@ class PropelCollector extends DataCollector implements Renderable, LoggerInterfa
         return array(
             'nb_statements' => count($this->statements),
             'nb_failed_statements' => 0,
-            'accumulated_duration' => '10',
-            'accumulated_duration_str' => $this->formatDuration(1),
+            'accumulated_duration' => $this->accumulatedTime,
+            'accumulated_duration_str' => $this->formatDuration($this->accumulatedTime),
             'peak_memory_usage' => $this->peakMemory,
             'peak_memory_usage_str' => $this->formatBytes($this->peakMemory),
             'statements' => $this->statements

local/modules/DebugBar/Smarty/Plugin/DebugBar.php

@@ -104,23 +104,6 @@ class DebugBar extends AbstractSmartyPlugin
         return $render;
     }
 
-    public function renderHead($params, \Smarty_Internal_Template $template)
-    {
-        $render = "";
-        if ($this->debugMode) {
-            $javascriptRenderer = $this->debugBar->getJavascriptRenderer();
-            $assets = $javascriptRenderer->getAssets();
-
-            $cssCollection = $assets[0];
-            $jsCollection = $assets[1];
-
-            $render .= sprintf('<style media="screen" type="text/css">%s</style>', $cssCollection->dump());
-            $render .= sprintf('<script>%s</script>', $jsCollection->dump());
-        }
-
-        return $render;
-    }
-
     /**
      * @return an array of SmartyPluginDescriptor
      */