Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159810
Change subject: New deployment build, fix bug with abuse / spam filter +
wikibase interaction
......................................................................
New deployment build, fix bug with abuse / spam filter + wikibase interaction
Change-Id: I80bb2f83b088a5a44aaeecfcbf47d908ff9bc912
---
M composer.lock
M extensions/Wikibase/repo/includes/content/EntityContent.php
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
4 files changed, 92 insertions(+), 90 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/10/159810/1
diff --git a/composer.lock b/composer.lock
index f5be60f..91e6a27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1187,12 +1187,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b6be045f4c7272774ff03daf717b97d3a397f7ea"
+ "reference": "3db3c7541dbc55668f491da1ea81be485a57cd0e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b6be045f4c7272774ff03daf717b97d3a397f7ea";,
- "reference": "b6be045f4c7272774ff03daf717b97d3a397f7ea",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3db3c7541dbc55668f491da1ea81be485a57cd0e";,
+ "reference": "3db3c7541dbc55668f491da1ea81be485a57cd0e",
"shasum": ""
},
"require": {
@@ -1261,7 +1261,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-09-11 14:37:14"
+ "time": "2014-09-11 18:24:41"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/content/EntityContent.php
b/extensions/Wikibase/repo/includes/content/EntityContent.php
index 12ae29a..f344303 100644
--- a/extensions/Wikibase/repo/includes/content/EntityContent.php
+++ b/extensions/Wikibase/repo/includes/content/EntityContent.php
@@ -414,7 +414,9 @@
'type',
);
- $data = $this->getEntity()->toArray();
+ // @todo this text for filters stuff should be it's own class
with test coverage!
+ $codec =
WikibaseRepo::getDefaultInstance()->getEntityContentDataCodec();
+ $data = json_decode( $codec->encodeEntity( $this->getEntity()
), true );
$values = self::collectValues( $data, $ignore );
diff --git a/vendor/composer/autoload_files.php
b/vendor/composer/autoload_files.php
index 968d4af..aa7629d 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -21,6 +21,6 @@
$baseDir . '/extensions/ValueView/ValueView.php',
$vendorDir . '/data-values/data-types/DataTypes.php',
$vendorDir . '/data-values/validators/Validators.php',
- $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
$baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php',
+ $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 55ab53a..917a962 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1121,90 +1121,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-mw1.24-wmf20",
- "version_normalized": "dev-mw1.24-wmf20",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "b6be045f4c7272774ff03daf717b97d3a397f7ea"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b6be045f4c7272774ff03daf717b97d3a397f7ea";,
- "reference": "b6be045f4c7272774ff03daf717b97d3a397f7ea",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.2.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~0.1.0",
- "data-values/geo": "~0.2.0",
- "data-values/interfaces": "~0.1.4",
- "data-values/javascript": "~0.6.0",
- "data-values/number": "~0.4.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.6.0",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.7.0",
- "diff/diff": "~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~1.0",
- "wikibase/data-model-javascript": "~0.3.0",
- "wikibase/data-model-serialization": "~1.1",
- "wikibase/easyrdf_lite": "~0.8.1",
- "wikibase/internal-serialization": "~1.2",
- "wikibase/serialization-javascript": "~1.1.1"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "time": "2014-09-11 14:37:14",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "Wikibase.composer.php"
- ],
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/MockPageUpdater.php",
- "client/tests/phpunit/MockClientStore.php",
-
"client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php",
-
"client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/tests/phpunit/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Repo\\View\\": "repo/includes/View"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GNU GPL v2+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ]
- },
- {
"name": "wikibase/Wikidata.org",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -1353,5 +1269,89 @@
"wikibase",
"wikidata"
]
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-mw1.24-wmf20",
+ "version_normalized": "dev-mw1.24-wmf20",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "3db3c7541dbc55668f491da1ea81be485a57cd0e"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3db3c7541dbc55668f491da1ea81be485a57cd0e";,
+ "reference": "3db3c7541dbc55668f491da1ea81be485a57cd0e",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.2.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~0.1.0",
+ "data-values/geo": "~0.2.0",
+ "data-values/interfaces": "~0.1.4",
+ "data-values/javascript": "~0.6.0",
+ "data-values/number": "~0.4.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.6.0",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.7.0",
+ "diff/diff": "~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~1.0",
+ "wikibase/data-model-javascript": "~0.3.0",
+ "wikibase/data-model-serialization": "~1.1",
+ "wikibase/easyrdf_lite": "~0.8.1",
+ "wikibase/internal-serialization": "~1.2",
+ "wikibase/serialization-javascript": "~1.1.1"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "time": "2014-09-11 18:24:41",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockPageUpdater.php",
+ "client/tests/phpunit/MockClientStore.php",
+
"client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php",
+
"client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/tests/phpunit/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Repo\\View\\": "repo/includes/View"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GNU GPL v2+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/159810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80bb2f83b088a5a44aaeecfcbf47d908ff9bc912
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: mw1.24-wmf20
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
