Merge "Deprecate Parser::fetchFile() since it's unused"

[lhc/web/wiklou.git] / includes / installer / Installer.php

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 1efe5d6..284d5dd 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -990,6 +990,10 @@ abstract class Installer {
                        return true;
                }
 
+               if ( Shell::isDisabled() ) {
+                       return true;
+               }
+
                # Get a list of available locales.
                $result = Shell::command( '/usr/bin/locale', '-a' )
                        ->execute();
@@ -1133,7 +1137,7 @@ abstract class Installer {
                /**
                 * This needs to be updated something that the latest libicu
                 * will properly normalize.  This normalization was found at
-                * http://www.unicode.org/versions/Unicode5.2.0/#Character_Additions
+                * https://www.unicode.org/versions/Unicode5.2.0/#Character_Additions
                 * Note that we use the hex representation to create the code
                 * points in order to avoid any Unicode-destroying during transit.
                 */
@@ -1199,7 +1203,7 @@ abstract class Installer {
                $scriptTypes = [
                        'php' => [
                                "<?php echo 'ex' . 'ec';",
-                               "#!/var/env php5\n<?php echo 'ex' . 'ec';",
+                               "#!/var/env php\n<?php echo 'ex' . 'ec';",
                        ],
                ];