Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix PHP error from a failed database connection #7815

Merged
merged 3 commits into from
Aug 18, 2023
Merged

Fix PHP error from a failed database connection #7815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40d4cd3
Fix PHP error from a failed database connection
jdarwood007 Jul 31, 2023
c98729c
check check
jdarwood007 Aug 14, 2023
baf4050
Inverted logic
jdarwood007 Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Sources/Subs-Db-mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix,
'db_server_info' => 'smf_db_get_server_info',
'db_affected_rows' => 'smf_db_affected_rows',
'db_transaction' => 'smf_db_transaction',
'db_error' => 'mysqli_error',
'db_error' => 'smf_db_errormsg',
'db_select_db' => 'smf_db_select',
'db_title' => MYSQL_TITLE,
'db_sybase' => false,
Expand Down Expand Up @@ -1099,4 +1099,20 @@ function smf_db_escape_string($string, $connection = null)
return mysqli_real_escape_string($connection === null ? $db_connection : $connection, $string);
}

/**
* Wrapper to handle null errors
*
* @param null|mysqli $connection = null The connection to use (null to use $db_connection)
* @return string escaped string
*/
function smf_db_errormsg($connection = null)
{
global $db_connection;

if ($connection === null && $db_connection === null)
return '';

return mysqli_error($connection === null ? $db_connection : $connection);
}

?>
18 changes: 17 additions & 1 deletion Sources/Subs-Db-postgresql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, &$db_prefix
'db_server_info' => 'smf_db_version',
'db_affected_rows' => 'smf_db_affected_rows',
'db_transaction' => 'smf_db_transaction',
'db_error' => 'pg_last_error',
'db_error' => 'smf_db_errormsg',
'db_select_db' => 'smf_db_select_db',
'db_title' => POSTGRE_TITLE,
'db_sybase' => true,
Expand Down Expand Up @@ -1033,4 +1033,20 @@ function smf_db_connect_errno()
return $pg_connect_errno;
}

/**
* Wrapper to handle null errors
*
* @param null|PgSql\Connection $connection = null The connection to use (null to use $db_connection)
* @return string escaped string
*/
function smf_db_errormsg($connection = null)
{
global $db_connection;

if ($connection === null && $db_connection === null)
return '';

return pg_last_error($connection === null ? $db_connection : $connection);
}

?>
Loading