|
@@ -75,7 +75,7 @@ discard block |
|
|
block discarded – undo |
|
75
|
75
|
display_db_error(); |
|
76
|
76
|
|
|
77
|
77
|
// We need to escape ' and \ |
|
78
|
|
- $db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd); |
|
|
78
|
+ $db_passwd = str_replace(array('\\', '\''), array('\\\\', '\\\''), $db_passwd); |
|
79
|
79
|
|
|
80
|
80
|
// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch. |
|
81
|
81
|
set_error_handler( |
|
@@ -926,7 +926,7 @@ discard block |
|
|
block discarded – undo |
|
926
|
926
|
if (!empty($inTransaction)) |
|
927
|
927
|
$smcFunc['db_transaction']('rollback'); |
|
928
|
928
|
|
|
929
|
|
- if(empty($db_persist)) |
|
|
929
|
+ if (empty($db_persist)) |
|
930
|
930
|
{ // without pooling |
|
931
|
931
|
if (empty($pg_error_data_prep)) |
|
932
|
932
|
$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors', |
Please login to merge, or discard this patch.
SimpleMachines /
SMF2.1
