From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 May 2018 23:53:37 +0000 (+0000)
Subject: Merge "IcuCollation: Use codepoint as tiebreaker when getting first-letters" into... 
X-Git-Tag: 1.31.0-rc.1~8
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=15f074d2baa3d3e83dfe06a9269dd01b81360315;hp=b941889b4e9b7620eb6dbfc7bd19b341d2c9d94c;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 572bff87f5..1273d3e0b2 160000
--- 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 aa9cd494b2..4b6e8ccd48 100644
--- 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 9679bfeeec..78b3f8e29b 100644
--- 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 ) {