From dd11297837f50ea2fd37f891cb8b4408f84f53e0 Mon Sep 17 00:00:00 2001
From: Steffen Stollfuß <j0inty@users.noreply.github.com>
Date: Sun, 8 Nov 2015 20:52:25 +0100
Subject: CI_DB_driver->simple_query() discard return of
 CI_DB_driver->initialize() when db_debug = FALSE

#4223
---
 system/database/DB_driver.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'system')

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 0ea679432..6797df0f8 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -774,7 +774,10 @@ abstract class CI_DB_driver {
 	{
 		if ( ! $this->conn_id)
 		{
-			$this->initialize();
+			if( !$this->initialize() )
+			{
+				return FALSE;
+			}
 		}
 
 		return $this->_execute($sql);
-- 
cgit v1.2.3-24-g4f1b