From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 13 Jun 2016 16:30:27 +0000 (+0000)
Subject: Merge "Don't look for hooks in .php5 files that don't exist"
X-Git-Tag: 1.31.0-rc.0~6634
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=299b792a9577fd658a9143c41c15c041c9451cf1;hp=f2c9dea186ebe4f47601d4508a874e6c059cb35c;p=lhc%2Fweb%2Fwiklou.git

Merge "Don't look for hooks in .php5 files that don't exist"
---

diff --git a/docs/hooks.txt b/docs/hooks.txt
index a83f9c6a6e..b3142ab569 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2993,9 +2993,9 @@ $t: title object searched for
 canceled and a normal search will be performed. Returning true without setting
 $url does a standard redirect to $title. Setting $url redirects to the
 specified URL.
-$term - The string the user searched for
-$title - The title the 'go' feature has decided to forward the user to
-&$url - Initially null, hook subscribers can set this to specify the final url to redirect to
+$term: The string the user searched for
+$title: The title the 'go' feature has decided to forward the user to
+&$url: Initially null, hook subscribers can set this to specify the final url to redirect to
 
 'SpecialSearchNogomatch': Called when user clicked the "Go" button but the
 target doesn't exist.
@@ -3383,6 +3383,7 @@ $title: Title of the page in question
 &$user: User object
 $ip: User's IP address
 &$blocked: Whether the user is blocked, to be modified by the hook
+&$block: The Block object, to be modified by the hook
 
 'UserIsEveryoneAllowed': Check if all users are allowed some user right; return
 false if a UserGetRights hook might remove the named right.
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index d70a6b91da..fce68bba4e 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -661,7 +661,7 @@ abstract class Skin extends ContextSource {
 
 		if ( $out->isArticle() && MWNamespace::hasSubpages( $out->getTitle()->getNamespace() ) ) {
 			$ptext = $this->getTitle()->getPrefixedText();
-			if ( preg_match( '/\//', $ptext ) ) {
+			if ( strpos( $ptext, '/' ) !== false ) {
 				$links = explode( '/', $ptext );
 				array_pop( $links );
 				$c = 0;
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.styles.css b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
index 26c500d068..da356b1ff9 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
@@ -35,6 +35,9 @@ div.searchresult {
 	margin-left: 0;
 	float: left;
 }
+.mw-search-interwiki-header {
+	clear: both;
+}
 .mw-search-results li {
 	padding-bottom: 1.2em;
 	list-style: none;