All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[mailer.git] / inc / extensions / ext-sql_patches.php

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index 8da3cde53aa679453f82e5455cd28920c27341cf..2c3ef53d4f9f0bda50a308c44bdff3c6332b5a0f 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -735,13 +735,13 @@ default: // Do stuff when extension is loaded
                        global $cacheInstance;
 
                        // Maybe need setup of secret key!
-                       require_once(PATH."inc/gen_sql_patches.php");
+                       LOAD_INC_ONCE("inc/gen_sql_patches.php");
 
                        // @TODO Rewrite this to a filter!
                        if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheInstance)) && (is_object($cacheInstance))) {
                                // Remove extensions and mod_reg cache file
-                               require_once(PATH."inc/libs/cache_functions.php");
-                               require_once(PATH."inc/extensions/ext-cache.php");
+                               LOAD_INC_ONCE("inc/libs/cache_functions.php");
+                               LOAD_INC_ONCE("inc/extensions/ext-cache.php");
                                if ($cacheInstance->loadCacheFile("extensions", true)) $cacheInstance->destroyCacheFile();
                                if ($cacheInstance->loadCacheFile("mod_reg"))          $cacheInstance->destroyCacheFile();
                        } // END - if
@@ -750,7 +750,7 @@ default: // Do stuff when extension is loaded
                // Test again
                if ((getConfig('file_hash') != "") && (getConfig('master_salt') != "") && (getConfig('pass_scramble') != "")) {
                        // File hash fas generated so we can also file the secret file... hopefully.
-                       $hashFile = sprintf("%sinc/.secret/.%s", PATH, getConfig('file_hash'));
+                       $hashFile = sprintf("%sinc/.secret/.%s", constant('PATH'), getConfig('file_hash'));
                        if (FILE_READABLE($hashFile)) {
                                // Read file
                                $_CONFIG['secret_key'] = READ_FILE($hashFile);