Add debugbar code back.

Author: pocketarc

system/core/Loader.php

@@ -498,7 +498,20 @@ class_exists('CI_DB', FALSE) OR $this->database();
 	 */
 	public function view($view, $vars = array(), $return = FALSE)
 	{
-		return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));
+		$measure = "View - $view";
+		$CI =& get_instance();
+
+		if ($CI->debugbar) {
+			$CI->debugbar["time"]->startMeasure($measure);
+		}
+
+		$result = $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));
+
+		if ($CI->debugbar) {
+			$CI->debugbar["time"]->stopMeasure($measure);
+		}
+
+		return $result;
 	}
 
 	// --------------------------------------------------------------------

system/database/drivers/pdo/pdo_driver.php

@@ -36,6 +36,9 @@
  * @since	Version 2.1.0
  * @filesource
  */
+
+use DebugBar\DataCollector\PDO\TraceablePDO;
+
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
@@ -129,6 +132,8 @@ public function __construct($params)
 	 */
 	public function db_connect($persistent = FALSE)
 	{
+		global $debugbar;
+
 		if ($persistent === TRUE)
 		{
 			$this->options[PDO::ATTR_PERSISTENT] = TRUE;
@@ -144,7 +149,13 @@ public function db_connect($persistent = FALSE)
 
 		try
 		{
-			return new PDO($this->dsn, $this->username, $this->password, $this->options);
+			if ($debugbar) {
+				$pdo = new TraceablePDO(new PDO($this->dsn, $this->username, $this->password, $this->options));
+				$debugbar->addCollector(new DebugBar\DataCollector\PDO\PDOCollector($pdo));
+				return $pdo;
+			} else {
+				return new PDO($this->dsn, $this->username, $this->password, $this->options);
+			}
 		}
 		catch (PDOException $e)
 		{