Heacy rewrite/cleanup:

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 5414a494aed972b5916ae3b7b507e49a3f2543af..3a8c1108a3ff86b0e596b0a1802faac81a6afbf8 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -52,13 +52,13 @@ function sqlQuery ($sqlString, $file, $line, $enableCodes = TRUE) {
                // Empty query string or link is not up?
                if (empty($sqlStringModified)) {
                        // Empty SQL string!
-                       reportBug(__FUNCTION__, __LINE__, sprintf("SQL string is empty, please fix this: file=%s, line=%s",
+                       reportBug(__FUNCTION__, __LINE__, sprintf('SQL string is empty, please fix this: file=%s, line=%s',
                                basename($file),
                                $line
                        ));
                } elseif (!isSqlLinkUp()) {
                        // We should not quietly ignore this
-                       reportBug(__FUNCTION__, __LINE__, sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+                       reportBug(__FUNCTION__, __LINE__, sprintf('Cannot query database: sqlString=%s,file=%s,line=%s',
                                $sqlStringModified,
                                basename($file),
                                $line
@@ -222,7 +222,7 @@ function sqlConnectToDatabase ($host, $login, $password, $file, $line) {
                 * isSqlLinkUp() will only return 'true' if there is really a
                 * working database link.
                 */
-               setSqlLink(__FUNCTION__, __LINE__, $linkResource);
+               setSqlLink($file . ':' . __FUNCTION__, $line . ':' . __LINE__, $linkResource);
 
                // Init charsets (UTF-8 is default now)
                sqlQuery("SET
@@ -230,7 +230,7 @@ function sqlConnectToDatabase ($host, $login, $password, $file, $line) {
        `character_set_client`='utf8',
        `character_set_connection`='utf8',
        `character_set_database`='utf8',
-       `character_set_server`='utf8'", __FUNCTION__, __LINE__);
+       `character_set_server`='utf8'", $file . ':' . __FUNCTION__, $line . ':' . __LINE__);
        } // END - if
 
        // Return the resource
@@ -374,7 +374,7 @@ function sqlError ($file, $line, $message) {
        } // END - if
 
        // Is there installation phase?
-       if (isInstallationPhase()) {
+       if (isInstaller()) {
                /*
                 * In installation phase, we don't want SQL errors abort e.g. connection
                 * tests, so just log it away.