From f5b16b5afbbf027785e4ea755966bd6b42d79741 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 13 Feb 2019 21:26:17 -0800
Subject: [PATCH] Closes #3674 PDO Don't overwrite e_db_pdo::$mySQLlastQuery
 with _getMySQLaccess()

---
 e107_handlers/e_db_pdo_class.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/e107_handlers/e_db_pdo_class.php b/e107_handlers/e_db_pdo_class.php
index 1b9c42ead..883a199b2 100644
--- a/e107_handlers/e_db_pdo_class.php
+++ b/e107_handlers/e_db_pdo_class.php
@@ -38,7 +38,7 @@ class e_db_pdo implements e_db
 	protected   $mySQLlastErrText = '';		// Text of last error - now protected, use getLastErrorText()
 	protected   $mySQLlastQuery = '';
 
-	protected      $mySQLcurTable;
+	protected   $mySQLcurTable;
 	public      $mySQLlanguage;
 	public      $mySQLinfo;
 	public      $tabset;
@@ -170,7 +170,7 @@ class e_db_pdo implements e_db
 		{
 			$this->mySQLlastErrText = $ex->getMessage();
 			$this->mySQLLastErrNum = $ex->getCode();
-			$this->dbg->log($this->mySQLlastErrText);	// Useful for Debug. breaks testing.
+			$this->dbg->log($this->mySQLlastErrText);
 			return false;
 		}
 
@@ -314,6 +314,7 @@ class e_db_pdo implements e_db
 		global $db_time, $queryinfo;
 		$this->queryCount++;
 
+		$this->_getMySQLaccess();
 		$this->mySQLlastQuery = $query;
 
 		if ($debug == 'now')
@@ -330,8 +331,6 @@ class e_db_pdo implements e_db
 			$this->log($log_type, $log_remark, $query);
 		}
 
-		$this->_getMySQLaccess();
-
 		$b = microtime();
 
 
@@ -437,13 +436,13 @@ class e_db_pdo implements e_db
 				if(isset($ex) && is_object($ex))
 				{
 					$query = $ex->getMessage();
-					$query .= print_a($ex->getTrace(), true);
+				 // 	 $arr = $ex->getTrace(); // @todo runs out of memory when tested.
+				  // $query .= print_a($arr, true);
 				}
 
 
 				if($buglink instanceof PDO)
 				{
-
 					$this->dbg->Mark_Query($query, 'PDO', $sQryRes, $aTrace, $mytime, $pTable);
 				}
 
@@ -1386,7 +1385,7 @@ class e_db_pdo implements e_db
 	{
 		$this->_getMySQLaccess();
 		$this->traffic->BumpWho('db Close', 1);
-		$this->mySQLaccess = NULL; // correct way to do it when using shared links.
+		$this->mySQLaccess = null; // correct way to do it when using shared links.
 		$this->dbError('dbClose');
 	}