Merge 285d7cb into 73aa521

codeigniter4 · Nov 16, 2018 · d1593ed · d1593ed
2 parents 73aa521 + 285d7cb
commit d1593ed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2173,7 +2173,7 @@ public function setUpdateBatch($key, $index = '', $escape = null)
 
 		if (! is_array($key))
 		{
-			// @todo error
+			return;
 		}
 
 		is_bool($escape) || $escape = $this->db->protectIdentifiers;

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -633,8 +633,6 @@ public function query(string $sql, $binds = null, $queryClass = 'CodeIgniter\\Da
 				$this->transStatus = false;
 			}
 
-			// @todo deal with errors
-
 			if ($this->DBDebug)
 			{
 				// We call this function in order to roll-back queries
@@ -648,15 +646,11 @@ public function query(string $sql, $binds = null, $queryClass = 'CodeIgniter\\Da
 
 					if ($transDepth === $this->transDepth)
 					{
-						// @todo log
-						// log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
+						log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
 						break;
 					}
 				}
 
-				// display the errors....
-				// @todo display the error...
-
 				return false;
 			}
 

diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
@@ -756,8 +756,6 @@ public function redirect(string $uri, string $method = 'auto', int $code = null)
 
 		$this->setStatusCode($code);
 
-		$this->sendHeaders();
-
 		return $this;
 	}