Commit 9323d9bc authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Force safe mode in the upgrader so corrupt non-bundled addon overrides do not break it

parent e4211c1c

sources/global2.php

+5 −0
Original line number Diff line number Diff line
@@ -1750,6 +1750,11 @@ function get_site_name() : string 
 */

function in_safe_mode() : bool

{

    // Force safe mode in the upgrader so corrupt non-bundled addon overrides do not break it

    if (running_script('upgrader')) {

        return true;

    }



    global $SITE_INFO;

    if (!empty($SITE_INFO['safe_mode'])) {

        if (!isset($_GET['keep_safe_mode'])) {

sources/minikernel.php

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ function is_guest($member_id = null) 
 */

function in_safe_mode()

{

    return get_param_integer('keep_safe_mode', 0) == 1;

    // Force safe mode in the upgrader so corrupt non-bundled addon overrides do not break it

    return (get_param_integer('keep_safe_mode', 0) == 1) || (running_script('upgrader'));

}



/**