Merge pull request #8998 from live627/log

[2.1] Ignore errors when attempting to log errors

Author: jdarwood007

Sources/Errors.php

@@ -135,11 +135,18 @@ function log_error($error_message, $error_type = 'general', $file = null, $line
 			$query = $smcFunc['db_query']('', '
 				SELECT COUNT(*)
 				FROM {db_prefix}log_errors',
-				array()
+				array(
+					'db_error_skip' => true,
+				)
 			);
 
-			list($context['num_errors']) = $smcFunc['db_fetch_row']($query);
-			$smcFunc['db_free_result']($query);
+			if ($query)
+			{
+				list($context['num_errors']) = $smcFunc['db_fetch_row']($query);
+				$smcFunc['db_free_result']($query);
+			}
+			else
+				$context['num_errors'] = 0;
 		}
 		else
 			$context['num_errors']++;
@@ -582,8 +589,13 @@ function log_error_online($error, $sprintf = array())
 		WHERE session = {string:session}',
 		array(
 			'session' => $session_id,
+			'db_error_skip' => true,
 		)
 	);
+
+	if (!$request)
+		return;
+
 	if ($smcFunc['db_num_rows']($request) != 0)
 	{
 		// If this happened very early on in SMF startup, $smcFunc may not fully be defined.

Sources/Subs-Db-mysql.php

@@ -787,7 +787,7 @@ function smf_db_insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 				', $insertRows),
 			array(
 				'security_override' => true,
-				'db_error_skip' => $table === $db_prefix . 'log_errors',
+				'db_error_skip' => preg_match('/log_errors|sessions/', $table),
 			),
 			$connection
 		);
@@ -1003,6 +1003,9 @@ function smf_db_error_insert($error_array)
 			VALUES( ?, ?, unhex(?), ?, ?, ?, ?, ?, ?, ?)'
 		);
 
+	if (empty($mysql_error_data_prep))
+		return;
+
 	if (filter_var($error_array[2], FILTER_VALIDATE_IP) !== false)
 		$error_array[2] = bin2hex(inet_pton($error_array[2]));
 	else