Commit 7e19fc96 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-3951

parent f258eede

adminzone/pages/modules/admin_setupwizard.php

+0 −4
Original line number Diff line number Diff line
@@ -963,8 +963,6 @@ class Module_admin_setupwizard 
                if (post_param_integer('addon_' . $addon_info['name'], 0) == 0 && $addon_info['name'] != 'core' && substr($addon_info['name'], 0, 5) != 'core_') {

                    $uninstalling[$addon_info['name']] = $addon_info;

                }



                $addons_installed[$i] = $addon_info;

            }

            $addons_not_installed = find_available_addons(false);

            $installing = array();
@@ -972,8 +970,6 @@ class Module_admin_setupwizard 
                if (post_param_integer('addon_' . $addon_info['name'], 0) == 1) {

                    $installing[] = $addon_info['name'];

                }



                $addons_installed[$i] = $addon_info;

            }

            do {

                $cnt = count($uninstalling);

sources/addons2.php

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ function uninstall_addon($addon, $clear_caches = true) 
    // Try and cleanup some empty/unneeded dirs

    krsort($dirs);

    foreach (array_keys($dirs) as $dir) {

        if (array_diff(scandir($dir), array('..', '.')) == array()) {

        if (array_diff(scandir(get_file_base() . '/' . $dir), array('..', '.')) == array()) {

            afm_delete_directory($dir);

        }

    }