Fix for PHP error

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index bdfc0cd94aada47832ce84a84ef7d4da1d62c8a5..9cd96c8fa492f27b5bdde675b4488abe42986120 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,6 +40,10 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
+// Default is not a frameset
+global $isFrameset;
+$isFrameset = false;
+
 // Load library
 require_once(PATH."inc/db/lib.php");
 
@@ -113,15 +117,12 @@ LIMIT 1", __FILE__, __LINE__);
                                        // Run daily reset
                                        if ((date("d", $_CONFIG['last_update']) != date("d", time()) || ((isBooleanConstantAndTrue('DEBUG_MODE')))) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) {
                                                // Do daily things in external PHP file but only when script is completely setup
-                                               $INC_POOL[] = PATH."inc/reset/reset_daily.php";
+                                               $INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
 
                                                // Daily reset was run!
                                                define('__DAILY_RESET', "1");
                                        }
 
-                                       // Load all extensions
-                                       require_once(PATH."inc/load_extensions.php");
-
                                        // Load "databases" aka static arrays
                                        require_once(PATH."inc/databases.php");
 
@@ -233,7 +234,6 @@ LIMIT 1", __FILE__, __LINE__);
        // Include required files
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/theme-manager.php");
-       require_once(PATH."inc/load_extensions.php");
 
        // Check if we are in installation routine
        $installPhp = basename($_SERVER['PHP_SELF']);