Merge "IcuCollation: Use codepoint as tiebreaker when getting first-letters" into...

diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 572bff8..1273d3e 160000 (submodule)
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
@@ -1 +1 @@
-Subproject commit 572bff87f55e7a9fd0618d75de437abe40bd3670
+Subproject commit 1273d3e0b2189e33fed0567f589a3e7bc4ae6d4e

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index aa9cd49..4b6e8cc 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();

diff --git a/includes/utils/ExecutableFinder.php b/includes/utils/ExecutableFinder.php
index 9679bfe..78b3f8e 100644 (file)
--- a/includes/utils/ExecutableFinder.php
+++ b/includes/utils/ExecutableFinder.php
@@ -94,6 +94,11 @@ class ExecutableFinder {
         * @return bool|string
         */
        public static function findInDefaultPaths( $names, $versionInfo = false ) {
+               if ( Shell::isDisabled() ) {
+                       // If we can't shell out, there's no point looking for executables
+                       return false;
+               }
+
                $paths = self::getPossibleBinPaths();
                foreach ( (array)$names as $name ) {
                        foreach ( $paths as $path ) {