Filter moved, fixes for RNG

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index f64b28f064ca6e480bd9c758930ca6a5e2823e2e..3f7569eaa3ca5d4c12b2daad0cb3a1066d09cb89 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -660,7 +660,7 @@ function FILTER_RUN_DAILY_RESET () {
 // Filter for loading more runtime includes (not for installation)
 function FILTER_LOAD_RUNTIME_INCLUDES () {
        // Load more includes
-       foreach (array('inc/session.php','inc/versions.php') as $inc) {
+       foreach (array('inc/databases.php','inc/session.php','inc/versions.php') as $inc) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
@@ -699,7 +699,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 // Init random number/cache buster
 function FILTER_INIT_RANDOM_NUMBER () {
        // Is the extension sql_patches installed and at least 0.3.6?
-       if ((isExtensionActive('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6')) {
+       if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
                // Generate random number
                setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
        } else {