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

Fixed MANTIS-5507 (_config.php was being included in installer archives when it should not)

parent fbf57671

sources/files.php

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ function should_ignore_file($filepath, $bitmask = 0, $bitmask_defaults = 0) 
    if (($bitmask & IGNORE_BUNDLED_VOLATILE) != 0) {

        $ignore_filenames_and_dir_names += array(

            // Bundled stuff that is not necessarily in a *_custom dir yet is volatile

            '_config.php' => '',

            'map.ini' => 'themes',

            'functions.bin' => 'data_custom',

            'errorlog.php' => 'data_custom',
@@ -531,6 +530,7 @@ function should_ignore_file($filepath, $bitmask = 0, $bitmask_defaults = 0) 


        $ignore_filenames_and_dir_names += array(

            // Bundled stuff that is not necessarily in a *_custom dir yet is volatile and should not be included in shipped builds

            '_config.php' => '',

            'latest.bin' => 'data_custom/modules/web_notifications',

            'permissioncheckslog.php' => 'data_custom',

            'failover_rewritemap.txt' => 'data_custom',

sources/hooks/systems/addon_registry/core.php

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ class Hook_addon_registry_core 
            'sources/hooks/systems/sitemap/zone.php',

            'sources/hooks/systems/sitemap/entry_point.php',

            'web.config',

            'data_custom/execute_temp.php.bundle',

            'data/html5.js', // LEGACY

            'data/external_url_proxy.php',

            'adminzone/.htaccess',

sources_custom/make_release.php

+0 −5
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ function make_installers($skip_file_grab = false) 
        }



        // Move files out temporarily

        rename($builds_path . '/builds/build/' . $version_branch . '/_config.php', $builds_path . '/builds/build/_config.php');

        rename($builds_path . '/builds/build/' . $version_branch . '/install.php', $builds_path . '/builds/build/install.php');



        // Put temporary files in main folder
@@ -344,7 +343,6 @@ function make_installers($skip_file_grab = false) 
        rename($builds_path . '/builds/build/composr', $builds_path . '/builds/build/' . $version_branch);



        // Move back files moved out temporarily

        rename($builds_path . '/builds/build/_config.php', $builds_path . '/builds/build/' . $version_branch . '/_config.php');

        rename($builds_path . '/builds/build/install.php', $builds_path . '/builds/build/' . $version_branch . '/install.php');



        // Remove temporary files from main folder
@@ -622,9 +620,6 @@ function populate_build_files_list($dir = '', $pretend_dir = '') 
    $version_branch = get_version_branch();



    // Imply files into the root that we would have skipped

    if ($pretend_dir == '') {

        $MAKE_INSTALLERS__FILE_ARRAY[$pretend_dir . '_config.php'] = '';

    }

    if ($pretend_dir == 'data_custom/') {

        $MAKE_INSTALLERS__FILE_ARRAY[$pretend_dir . 'execute_temp.php'] = file_get_contents(get_file_base() . '/data_custom/execute_temp.php.bundle');

    }