Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/121441
Change subject: Update Wikibase to fix a problem with SpecialMobileWatchlist
......................................................................
Update Wikibase to fix a problem with SpecialMobileWatchlist
Includes Id057da66
Change-Id: Iaa24a88bbdafd7eff7f4e7168ab12e847fe626a9
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/includes/hooks/SpecialWatchlistQueryHandler.php
M vendor/autoload.php
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
7 files changed, 42 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/41/121441/1
diff --git a/composer.lock b/composer.lock
index 78069e5..4cd3d91 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "40f0508394897cdb56f9d10cfa1725beb0a50f07"
+ "reference": "b1508dacb96f2c9dee0d87c11e933bb69f80f33a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/40f0508394897cdb56f9d10cfa1725beb0a50f07";,
- "reference": "40f0508394897cdb56f9d10cfa1725beb0a50f07",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b1508dacb96f2c9dee0d87c11e933bb69f80f33a";,
+ "reference": "b1508dacb96f2c9dee0d87c11e933bb69f80f33a",
"shasum": ""
},
"require": {
@@ -914,7 +914,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-03-25 17:57:47"
+ "time": "2014-03-27 19:18:11"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php
b/extensions/Wikibase/client/WikibaseClient.hooks.php
index 21cd3a5..37ddadf 100644
--- a/extensions/Wikibase/client/WikibaseClient.hooks.php
+++ b/extensions/Wikibase/client/WikibaseClient.hooks.php
@@ -305,12 +305,12 @@
* @param array &$tables
* @param array &$join_conds
* @param array &$fields
- * @param array|FormOptions $opts array until MW 1.22, FormOptions
since MW 1.23
+ * @param FormOptions|null $opts
*
* @return bool
*/
public static function onSpecialWatchlistQuery( array &$conds, array
&$tables,
- array &$join_conds, array &$fields, $opts = array()
+ array &$join_conds, array &$fields, $opts
) {
$db = wfGetDB( DB_SLAVE );
$handler = new SpecialWatchlistQueryHandler(
$GLOBALS['wgUser'], $db );
diff --git
a/extensions/Wikibase/client/includes/hooks/SpecialWatchlistQueryHandler.php
b/extensions/Wikibase/client/includes/hooks/SpecialWatchlistQueryHandler.php
index 02ce7fa..34e6316 100644
--- a/extensions/Wikibase/client/includes/hooks/SpecialWatchlistQueryHandler.php
+++ b/extensions/Wikibase/client/includes/hooks/SpecialWatchlistQueryHandler.php
@@ -41,14 +41,18 @@
/**
* @param WebRequest $request
* @param array $conds
- * @param FormOptions $opts
+ * @param FormOptions|null $opts
*
* @return array
*/
public function addWikibaseConditions( WebRequest $request, array
$conds, $opts ) {
// do not include wikibase changes for activated enhanced
watchlist
// since we do not support that format yet
- if ( $this->isEnhancedChangesEnabled( $request ) === true ||
$opts->getValue( 'hideWikibase' ) === true ) {
+ if (
+ $this->isEnhancedChangesEnabled( $request ) === true ||
+ !$opts ||
+ $opts->getValue( 'hideWikibase' ) === true
+ ) {
$newConds = $this->makeHideWikibaseConds( $conds );
} else {
$newConds = $this->makeShowWikibaseConds( $conds );
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 9c2cd50..caccd14 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitb3596aecb96c947abd151a98112889bc::getLoader();
+return ComposerAutoloaderInit6a0ad6567bb3afac3cac102839337657::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 47ae2ee..a710555 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -291,8 +291,25 @@
return $this->classMap[$class];
}
+ $file = $this->findFileWithExtension($class, '.php');
+
+ // Search for Hack files if we are running on HHVM
+ if ($file === null && defined('HHVM_VERSION')) {
+ $file = $this->findFileWithExtension($class, '.hh');
+ }
+
+ if ($file === null) {
+ // Remember that this class does not exist.
+ return $this->classMap[$class] = false;
+ }
+
+ return $file;
+ }
+
+ private function findFileWithExtension($class, $ext)
+ {
// PSR-4 lookup
- $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
@@ -321,7 +338,7 @@
. strtr(substr($logicalPathPsr4, $pos + 1), '_',
DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
- $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) .
'.php';
+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
@@ -347,9 +364,6 @@
if ($this->useIncludePath && $file =
stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
-
- // Remember that this class does not exist.
- return $this->classMap[$class] = false;
}
}
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 8ae0c23..41a85e1 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb3596aecb96c947abd151a98112889bc
+class ComposerAutoloaderInit6a0ad6567bb3afac3cac102839337657
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitb3596aecb96c947abd151a98112889bc',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit6a0ad6567bb3afac3cac102839337657',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitb3596aecb96c947abd151a98112889bc',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit6a0ad6567bb3afac3cac102839337657',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireb3596aecb96c947abd151a98112889bc($file);
+ composerRequire6a0ad6567bb3afac3cac102839337657($file);
}
return $loader;
}
}
-function composerRequireb3596aecb96c947abd151a98112889bc($file)
+function composerRequire6a0ad6567bb3afac3cac102839337657($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b876797..526cb62 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -877,12 +877,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "40f0508394897cdb56f9d10cfa1725beb0a50f07"
+ "reference": "b1508dacb96f2c9dee0d87c11e933bb69f80f33a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/40f0508394897cdb56f9d10cfa1725beb0a50f07";,
- "reference": "40f0508394897cdb56f9d10cfa1725beb0a50f07",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b1508dacb96f2c9dee0d87c11e933bb69f80f33a";,
+ "reference": "b1508dacb96f2c9dee0d87c11e933bb69f80f33a",
"shasum": ""
},
"require": {
@@ -901,9 +901,9 @@
"wikibase/data-model": "~0.7.2",
"wikibase/easyrdf_lite": "~0.8.1"
},
- "time": "2014-03-25 17:57:47",
+ "time": "2014-03-27 19:18:11",
"type": "mediawiki-extension",
- "installation-source": "dist",
+ "installation-source": "source",
"autoload": {
"files": [
"Wikibase.composer.php"
--
To view, visit https://gerrit.wikimedia.org/r/121441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa24a88bbdafd7eff7f4e7168ab12e847fe626a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.23-wmf19
Gerrit-Owner: Hoo man <h...@online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
