Filter moved, fixes for RNG

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 7c88b79ca9e814abb561b2946335c165349e1ada..5e3a5d828499c33a1378e12c67dc8ffd33c587ad 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -120,10 +120,10 @@ ORDER BY
        registerFilter('init', 'LOAD_CONFIGURATION');
        registerFilter('init', 'INIT_EXTENSIONS');
        registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
        registerFilter('init', 'LOAD_CONFIGURATION');
        registerFilter('init', 'INIT_EXTENSIONS');
        registerFilter('init', 'LOAD_RUNTIME_INCLUDES');

-       registerFilter('init', 'CHECK_SVN_REVISION');
-       registerFilter('init', 'RUN_DAILY_RESET');

        registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'INIT_RANDOM_NUMBER');
        registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'INIT_RANDOM_NUMBER');

+       registerFilter('init', 'CHECK_SVN_REVISION');
+       registerFilter('init', 'RUN_DAILY_RESET');

        registerFilter('init', 'TRIGGER_SENDING_POOL');
        registerFilter('init', 'DETERMINE_USERNAME');
        registerFilter('init', 'DETERMINE_WHAT_ACTION');
        registerFilter('init', 'TRIGGER_SENDING_POOL');
        registerFilter('init', 'DETERMINE_USERNAME');
        registerFilter('init', 'DETERMINE_WHAT_ACTION');

diff --git a/inc/filters.php b/inc/filters.php
index 174dad1ad888c2abbceeb43db94aca371a59eda7..3f7569eaa3ca5d4c12b2daad0cb3a1066d09cb89 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -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?
 // 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 {
                // Generate random number
                setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
        } else {