Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145551
Change subject: Update Wikibase to fix a problem with the wbsearchentities API
......................................................................
Update Wikibase to fix a problem with the wbsearchentities API
Change-Id: Ifbab5fd016fc8caab937001473d5596752f47f5b
---
M composer.lock
M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
M vendor/composer/installed.json
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/145551/1
diff --git a/composer.lock b/composer.lock
index cf9f338..5bfc7a1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1157,12 +1157,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "2667e1a105154d5298a0b0461d343d359151033b"
+ "reference": "71157c007060d43b2afb8cbcb1fbd869e10f759a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2667e1a105154d5298a0b0461d343d359151033b";,
- "reference": "2667e1a105154d5298a0b0461d343d359151033b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/71157c007060d43b2afb8cbcb1fbd869e10f759a";,
+ "reference": "71157c007060d43b2afb8cbcb1fbd869e10f759a",
"shasum": ""
},
"require": {
@@ -1231,7 +1231,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-07-10 16:45:27"
+ "time": "2014-07-11 11:48:09"
}
],
"packages-dev": [
diff --git a/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
b/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
index 6902d3a..2b193a5 100644
--- a/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
+++ b/extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
@@ -674,7 +674,7 @@
if ( $hasWeight ) {
// if we take the weight into account, we need
to grab basically all hits in order
// to allow for the post-search sorting below.
- $queryOptions['LIMIT'] = min(
$options['LIMIT'], $internalLimit );
+ $queryOptions['LIMIT'] = $internalLimit;
} else {
$queryOptions['LIMIT'] = $options['LIMIT'];
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 03063f7..768d2c5 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1193,12 +1193,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "2667e1a105154d5298a0b0461d343d359151033b"
+ "reference": "71157c007060d43b2afb8cbcb1fbd869e10f759a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2667e1a105154d5298a0b0461d343d359151033b";,
- "reference": "2667e1a105154d5298a0b0461d343d359151033b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/71157c007060d43b2afb8cbcb1fbd869e10f759a";,
+ "reference": "71157c007060d43b2afb8cbcb1fbd869e10f759a",
"shasum": ""
},
"require": {
@@ -1224,7 +1224,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-07-10 16:45:27",
+ "time": "2014-07-11 11:48:09",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/145551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbab5fd016fc8caab937001473d5596752f47f5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.24-wmf12
Gerrit-Owner: Hoo man <h...@online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
