Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94338
Change subject: Remove hidden infomation flow in ChangeOpsMerge
......................................................................
Remove hidden infomation flow in ChangeOpsMerge
Change-Id: Ibcb6f180dbafae2dac3dc81cad1fc044afecce87
---
M repo/includes/ChangeOp/ChangeOpsMerge.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/94338/1
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 3b8e2cf..f9566ea 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -36,15 +36,15 @@
$this->toItemContent = $toItemContent;
$this->fromChangeOps = new ChangeOps();
$this->toChangeOps = new ChangeOps();
+ $this->assertValidIgnoreConflictValues( $ignoreConflicts );
$this->ignoreConflicts = $ignoreConflicts;
- $this->assertValidIgnoreConflictValues();
}
- private function assertValidIgnoreConflictValues() {
- if( !is_array( $this->ignoreConflicts ) ){
+ private function assertValidIgnoreConflictValues( $ignoreConflicts ) {
+ if( !is_array( $ignoreConflicts ) ){
throw new InvalidArgumentException( '$ignoreConflicts
must be an array' );
}
- foreach( $this->ignoreConflicts as $ignoreConflict ){
+ foreach( $ignoreConflicts as $ignoreConflict ){
if( $ignoreConflict !== 'label' && $ignoreConflict !==
'description' && $ignoreConflict !== 'sitelink' ){
throw new InvalidArgumentException(
'$ignoreConflicts array can only contain "label", "description" and or
"sitelink" values' );
}
--
To view, visit https://gerrit.wikimedia.org/r/94338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcb6f180dbafae2dac3dc81cad1fc044afecce87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
