User tables are now moved to ext-user

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 13b1be31a9186c45c528fbd106222553c71748f1..28748b0e569b1c1118ecf8c35d5d86e92110b472 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -191,6 +191,7 @@ function getFatalArray () {
 
 // Add a fatal error message to the queue array
 function addFatalMessage ($F, $L, $message, $extra="") {
+       debug_report_bug($message);
        if (is_array($extra)) {
                // Multiple extras for a message with masks
                $message = call_user_func_array('sprintf', $extra);
@@ -2390,10 +2391,10 @@ function GET_CURR_THEME() {
        }
 
        // Add (maybe) found theme.php file to inclusion list
-       $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($ret));
+       $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($ret));
 
        // Try to load the requested include file
-       if (FILE_READABLE($theme)) ADD_INC_TO_POOL($theme);
+       if (INCLUDE_READABLE($INC)) ADD_INC_TO_POOL($INC);
 
        // Return theme value
        return $ret;
@@ -3563,7 +3564,7 @@ function shutdown () {
        if (SQL_IS_LINK_UP()) {
                // Close link
                SQL_CLOSE(__FILE__, __LINE__);
-       } elseif (!isInstalling()) {
+       } elseif ((!isInstalling()) && (isInstalled())) {
                // No database link
                addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
        }