Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268301
Change subject: Test
......................................................................
Test
Change-Id: I005483667fdf3fd95d9f6d7c30a528bc1207ffcc
---
M Wikidata.php
M composer.json
2 files changed, 43 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/01/268301/1
diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..2aae403 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -10,6 +10,8 @@
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
+ /* Hack for REL1_25 since it is failing */
+ $wmgUseWikibaseVendor = true;
$wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
}
@@ -18,7 +20,11 @@
$wgEnableWikibaseRepo = false;
$wgEnableWikibaseClient = false;
-include_once __DIR__ . '/vendor/autoload.php';
+if ( !empty( $wmgUseWikibaseVendor ) ) {
+ if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ include_once __DIR__ . '/vendor/autoload.php';
+ }
+}
if ( !empty( $wmgUseWikibaseRepo ) ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
diff --git a/composer.json b/composer.json
index 23a8058..62ce305 100644
--- a/composer.json
+++ b/composer.json
@@ -1,38 +1,38 @@
{
- "name": "wikidata/wikidata",
- "description": "Wikidata build, including related components used for
wikidata.org.",
- "license": "GPL-2.0+",
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/wmde/Wikidata.org.git";
- },
- {
- "type": "vcs",
- "url": "https://github.com/wmde/WikimediaBadges.git";
- }
- ],
- "require": {
- "php": ">=5.3.0",
- "propertysuggester/property-suggester": "~2.1.0",
- "wikibase/wikibase": "dev-master",
- "wikibase/wikimedia-badges": "dev-master",
- "wikibase/Wikidata.org": "dev-master"
- },
- "autoload": {
- "psr-4": {
- "Wikidata\\": "src/"
- }
- },
- "scripts": {
- "post-install-cmd":
"Wikidata\\SettingsFileGenerator::generateDefaultSettings",
- "post-update-cmd":
"Wikidata\\SettingsFileGenerator::generateDefaultSettings"
- },
- "config": {
- "github-oauth":{
- "github.com":"845d568f46a682fbf7fc5f92ed9397fc4ebdc072"
- },
- "prepend-autoloader": false,
- "preferred-install": "dist"
- }
+ "name": "wikidata/wikidata",
+ "description": "Wikidata build, including related components used for
wikidata.org.",
+ "license": "GPL-2.0+",
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/wmde/Wikidata.org.git";
+ },
+ {
+ "type": "vcs",
+ "url": "https://github.com/wmde/WikimediaBadges.git";
+ }
+ ],
+ "require": {
+ "php": ">=5.3.0",
+ "propertysuggester/property-suggester": "~2.1.0",
+ "wikibase/wikibase": "dev-REL1_25",
+ "wikibase/wikimedia-badges": "dev-REL1_25",
+ "wikibase/Wikidata.org": "dev-REL1_25"
+ },
+ "autoload": {
+ "psr-4": {
+ "Wikidata\\": "src/"
+ }
+ },
+ "scripts": {
+ "post-install-cmd":
"Wikidata\\SettingsFileGenerator::generateDefaultSettings",
+ "post-update-cmd":
"Wikidata\\SettingsFileGenerator::generateDefaultSettings"
+ },
+ "config": {
+ "github-oauth":{
+ "github.com":"845d568f46a682fbf7fc5f92ed9397fc4ebdc072"
+ },
+ "prepend-autoloader": false,
+ "preferred-install": "dist"
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/268301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I005483667fdf3fd95d9f6d7c30a528bc1207ffcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
