From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 8 Nov 2016 21:32:00 +0000 (+0000)
Subject: Merge "Update weblinks in comments from HTTP to HTTPS"
X-Git-Tag: 1.31.0-rc.0~4920
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=69ae945e8d39972a07bea89ddb64bc0189b43ac2;p=lhc%2Fweb%2Fwiklou.git

Merge "Update weblinks in comments from HTTP to HTTPS"
---

69ae945e8d39972a07bea89ddb64bc0189b43ac2
diff --cc includes/libs/rdbms/database/DatabaseMysqlBase.php
index 76208c4c46,3e24ce6116..668443ba76
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@@ -569,10 -569,10 +569,10 @@@ abstract class DatabaseMysqlBase extend
  	 * @param string $fname
  	 * @return bool|array|null False or null on failure
  	 */
 -	function indexInfo( $table, $index, $fname = __METHOD__ ) {
 +	public function indexInfo( $table, $index, $fname = __METHOD__ ) {
  		# SHOW INDEX works in MySQL 3.23.58, but SHOW INDEXES does not.
  		# SHOW INDEX should work for 3.x and up:
- 		# http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
+ 		# https://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
  		$table = $this->tableName( $table );
  		$index = $this->indexName( $index );
  
diff --cc includes/user/User.php
index 2a59d5dacd,4a34371e16..273d555eff
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@@ -1689,8 -1689,9 +1689,8 @@@ class User implements IDBAccessObject 
  	 * @return bool True if blacklisted.
  	 */
  	public function inDnsBlacklist( $ip, $bases ) {
 -
  		$found = false;
- 		// @todo FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+ 		// @todo FIXME: IPv6 ???  (https://bugs.php.net/bug.php?id=33170)
  		if ( IP::isIPv4( $ip ) ) {
  			// Reverse IP, bug 21255
  			$ipReversed = implode( '.', array_reverse( explode( '.', $ip ) ) );