Commit 1bc067ad authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4197 (Page-access errors showing as critical errors)

parent 6a40f85c

sources/global2.php

+7 −4
Original line number Diff line number Diff line
@@ -415,10 +415,16 @@ function init__global2() 
    safe_ini_set('zlib.output_compression_level', '2'); // Compression doesn't get much better after this, but performance drop



    if ((!$MICRO_AJAX_BOOTUP) && (!$MICRO_BOOTUP)) {

        // Before anything gets outputted

        handle_logins();



        require_code('site'); // This powers the site (top level page generation)

    }



    // Okay, we've loaded everything critical. Don't need to tell Composr to be paranoid now.

    $BOOTSTRAPPING = false;



    // Before anything gets outputted

    if ((!$MICRO_AJAX_BOOTUP) && (!$MICRO_BOOTUP)) {

        check_has_page_access(); // Make sure we're authorised

    }
@@ -465,9 +471,6 @@ function init__global2() 
        modsecurity_workaround_enable();

    }



    // Okay, we've loaded everything critical. Don't need to tell Composr to be paranoid now.

    $BOOTSTRAPPING = false;



    if (($SEMI_DEV_MODE) && (!$MICRO_AJAX_BOOTUP)) { // Lots of code that only runs if you're a programmer. It tries to make sure coding standards are met.

        semi_dev_mode_startup();

    }