Commit 2b10aaff authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-5799 (Hotfixes via upgrader extracted no files)

parent e019a802

sources/upgrade_files.php

+2 −2
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ function _upgrader_file_upgrade_screen() : string 
    }



    $addon_contents = [];

    $addons_wanted = [];



    /*

     * Full CMS release archives will contain the entire addon_registry directory including index.html; hotfixes will not.
@@ -258,13 +259,12 @@ function _upgrader_file_upgrade_screen() : string 
                $files = is_array($wanted_functions[0]) ? call_user_func_array($wanted_functions[0][0], $wanted_functions[0][1]) : cms_eval($wanted_functions[0], $upgrade_file2, false);

            }

            $addon_contents[basename($upgrade_file2, '.php')] = $files;

            $addons_wanted[] = basename($upgrade_file2, '.php');

        }

    }



    // Find addons in the TAR to extract (should take priority over what we loaded from disk)

    afm_make_directory('exports/upgrade/', false, true);

    $addon_contents = [];

    $addons_wanted = [];

    foreach ($directory as $offset => $upgrade_file) {

        $extract_addon = false;

        if ((strpos($upgrade_file['path'], '/addon_registry/') !== false) && (substr($upgrade_file['path'], -4) == '.php')) {