X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=67fcdd4e781f3c490dabe5653ba4ac067e94a6da;hp=7f1447e22633207eaea9689732b9a8c8c3d4d198;hb=ff6e1b8fc739109c5e07413377268231f7a7c50d;hpb=5c8a9ba30d1aaa13a6f18c51548a4d3f2c25326e diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 7f1447e226..67fcdd4e78 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -203,10 +203,10 @@ function SQL_RESULT ($resource, $row, $field = '0') { // SQL connect function SQL_CONNECT ($host, $login, $password, $F, $L) { // Try to connect - $connect = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()); + $linkResource = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error()); // Set the link resource - SQL_SET_LINK($connect); + SQL_SET_LINK($linkResource); // Destroy cache unset($GLOBALS['is_sql_link_up']); @@ -218,7 +218,7 @@ function SQL_SELECT_DB ($dbName, $F, $L) { if (!SQL_IS_LINK_UP()) return false; // Return the result - return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()); + return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error()); } // SQL close link @@ -502,7 +502,10 @@ function SQL_GET_LINK () { // Setter for link function SQL_SET_LINK ($link) { // Is this a resource or null? - if ((!is_resource($link)) && (!is_null($link))) { + if ((ifFatalErrorsDetected()) && (isInstallationPhase())) { + // This may happen in installation phase + return; + } elseif ((!is_resource($link)) && (!is_null($link))) { // This should never happen! debug_report_bug(__FUNCTION__, __LINE__, sprintf("link is not resource or null. Type: %s", gettype($link))); } // END - if