Commit 1f5da298 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Implemented MANTIS-5894 (Inform of potential .htaccess changes)

parent 64805fd5

lang/EN/upgrade.ini

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ WARNING_FILE_OUTDATED_ADDON=<p>The following addons are not compatible with the 
FILE_MOVED=A module file, <kbd>{1}</kbd>, was apparently moved from the &ldquo;<kbd>{2}</kbd>&rdquo; zone to the &ldquo;<kbd>{3}</kbd>&rdquo; zone previously.

SH_COMMAND=<p>Here is a sh/bash/cygwin command to run on your computer to assist you in isolating out the files to easily batch upload (you need to substitute in <kbd>manual-extracted-at-dir</kbd> and <kbd>temp-dir-to-upload-from</kbd>):<br /><kbd>{1}</kbd></p>

RM_HINT=<p>To delete in Commandr type the following commands separately in sequence:<br /><kbd>cd /raw<br />rm &lt;files-you-decided-to-delete&gt;</kbd><br />(you can copy and paste multi-line file lists onto the end of an Commandr command with no problem)</p>

UPGRADER_HTACCESS=In your installation root, check <kbd>recommended.htaccess</kbd> for any changes that might have been made since the previous version. Compare / diff it with <kbd>.htaccess</kbd> and merge in any relevant changes for your site.



UPGRADER_DATABASE_UPGRADE=Do a database upgrade (upgrade/install core-database/modules/blocks)

UPGRADER_UPGRADED_CORE_TABLES=<p>Upgraded core tables.</p>

sources/upgrade.php

+11 −0
Original line number Diff line number Diff line
@@ -526,6 +526,8 @@ function upgrader_menu_screen() : string 
    $l_integrity_scan_no_merging = upgrader_link('upgrader.php?type=integrity_scan', do_lang('UPGRADER_INTEGRITY_SCAN_NO_CSS_MERGE'), false);

    $l_integrity_scan_2 = do_lang('UPGRADER_INTEGRITY_SCAN_2');



    $l_htaccess = do_lang('UPGRADER_HTACCESS');



    // Database upgrade link

    $l_db_upgrade = upgrader_link('upgrader.php?type=db_upgrade', do_lang('UPGRADER_DATABASE_UPGRADE'), false);
@@ -617,6 +619,15 @@ function upgrader_menu_screen() : string 
                    <tr><th>{$_step_num}</th><td>{$l_integrity_scan_no_merging}<!-- " . do_lang('OR') . " {$l_integrity_scan}--><br />{$l_not_for_patch}</td><td>" . str_replace(' ', '&nbsp;', escape_html(display_time_period(60 * 30))) . "&nbsp;&dagger;</td></tr>

    ";



    // Check .htaccess file

    if (is_file(get_file_base() . '/.htaccess')) {

        $step_num++;

        $_step_num = strval($step_num);

        $out .= "

                    <tr><th>{$_step_num}</th><td>{$l_htaccess}</td><td>" . escape_html(display_time_period(60 * 5)) . "</td></tr>

        ";

    }



    // Database upgrade

    $step_num++;

    $_step_num = strval($step_num);