date:20161231

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Submodule update

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329817 )

Change subject: Submodule update
..


Submodule update

Change-Id: Ide15f289db6c750d12cd97a7a0d405d7bce61d02
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gui b/gui
index 0606935..5cc146c 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 0606935578aef6a0fde99a32b7431933455540e8
+Subproject commit 5cc146c672e72407998bcb401b030ee64934b8d3

-- 
To view, visit https://gerrit.wikimedia.org/r/329817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide15f289db6c750d12cd97a7a0d405d7bce61d02
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Submodule update

2016-12-31 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329817 )

Change subject: Submodule update
..

Submodule update

Change-Id: Ide15f289db6c750d12cd97a7a0d405d7bce61d02
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/17/329817/1

diff --git a/gui b/gui
index 0606935..5cc146c 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 0606935578aef6a0fde99a32b7431933455540e8
+Subproject commit 5cc146c672e72407998bcb401b030ee64934b8d3

-- 
To view, visit https://gerrit.wikimedia.org/r/329817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide15f289db6c750d12cd97a7a0d405d7bce61d02
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from c843f8bde35e59d83ce35caaf8a4e03cb8d1ba15:

2016-12-31 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329816 )

Change subject: Merging from c843f8bde35e59d83ce35caaf8a4e03cb8d1ba15:
..

Merging from c843f8bde35e59d83ce35caaf8a4e03cb8d1ba15:

Merge branch 'master' of https://gerrit.wikimedia.org/r/wikidata/query/gui

Change-Id: I32542280d43389e80f2d6314e5fb340f00c82115
---
M embed.html
M i18n/da.json
M i18n/diq.json
M i18n/eo.json
M i18n/gsw.json
M index.html
D js/embed.wdqs.min.eb5fad09e447397570ed.js
A js/embed.wdqs.min.ec52056ee803a8f4acbd.js
R js/wdqs.min.098c0a7acf7ef1dc2eee.js
D polestar/bower_components/zeroclipboard/dist/ZeroClipboard.swf
10 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy 
refs/changes/16/329816/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32542280d43389e80f2d6314e5fb340f00c82115
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Introduce stricter validation involving Newsletters' content...

2016-12-31 Thread Pppery (Code Review)

Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329815 )

Change subject: Introduce stricter validation involving Newsletters' content 
models
..

Introduce stricter validation involving Newsletters' content models

This removes the ability to change the content model of a page outside
the Newsletter namespace to NewsletterContent, which produces a stack
trace in some cases. It also prevents weird inconsistencies and behavior
resulting from changing the content model of a newsletter out of
NewsletterContent.

Bug: T154380
Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
---
M Newsletter.hooks.php
M extension.json
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/15/329815/1

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 742963f..1382244 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -288,4 +288,11 @@
}
return true;
}
+   public static function contentModelCanBeUsedOn( $modelId, Title $title, 
&$ok ){
+   if ( $title->inNamespace( NS_NEWSLETTER ) && $modelId != 
'NewsletterContent' ) {
+   $ok = false;
+   } else if ( $modelId == 'NewsletterContent' ) {
+   $ok = false;
+   }
+   }
 }
diff --git a/extension.json b/extension.json
index 774c4a5..897eff1 100644
--- a/extension.json
+++ b/extension.json
@@ -155,6 +155,9 @@
],
"TitleMove": [
"NewsletterHooks::onTitleMove"
+   ],
+   "ContentModelCanBeUsedOn": [
+   "NewsletterHooks::contentModelCanBeUsedOn"
]
},
"namespaces": [

-- 
To view, visit https://gerrit.wikimedia.org/r/329815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c991dac78f54867023571da4ba00d6cc2d64f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace invalid UTF-8 sequences with U+FFFD in edit summaries

2016-12-31 Thread TTO (Code Review)

TTO has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329814 )

Change subject: Replace invalid UTF-8 sequences with U+FFFD in edit summaries
..

Replace invalid UTF-8 sequences with U+FFFD in edit summaries

Change-Id: Ib22b563e7bc4022754752632f0eebfad00e8eb01
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/329814/1

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 44e4e3e..409f9d45 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1263,7 +1263,7 @@
$html = Sanitizer::decodeCharReferences( $html );
# It seems wise to escape ' as well as ", as a matter of 
course.  Can't
# hurt.
-   $html = htmlspecialchars( $html, ENT_QUOTES );
+   $html = htmlspecialchars( $html, ENT_QUOTES | ENT_SUBSTITUTE );
return $html;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib22b563e7bc4022754752632f0eebfad00e8eb01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Add missing guest message, also add qqq.json

2016-12-31 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329811 )

Change subject: Add missing guest message, also add qqq.json
..


Add missing guest message, also add qqq.json

Also add two optional messages.

Change-Id: I50828b6056f220d7c44c028f1b9f30a2068b2416
---
M i18n/en.json
A i18n/qqq.json
2 files changed, 14 insertions(+), 1 deletion(-)

Approvals:
  SamanthaNguyen: Verified; Looks good to me, approved



diff --git a/i18n/en.json b/i18n/en.json
index f944cbf..b9f4818 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,8 @@
]
},
"skinname-material": "Material",
-   "material-desc": "The Material Design language created by Google, 
captured in MediaWiki software"
+   "material-desc": "The Material Design language created by Google, 
captured in MediaWiki software",
+   "material.css": "/* CSS placed here will affect users of the Material 
skin */",
+   "material.js": "/* Any JavaScript here will be loaded for users using 
the Material skin */",
+   "material-guest": "Guest"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..aa4dc52
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,10 @@
+{
+   "@metadata": {
+   "authors": []
+   },
+   "skinname-material": "{{optional}}",
+   "material-desc": 
"{{desc|what=skin|name=Material|url=https://www.mediawiki.org/wiki/Skin:Material}};,
+   "material.css": "{{optional}}",
+   "material.js": "{{optional}}",
+   "material-guest": "Used for descbribing you as a guest editing the 
wiki.\n{{Identical|Guest}}"
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/329811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50828b6056f220d7c44c028f1b9f30a2068b2416
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/skins/Material
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: Siebrand 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Add jenkins tests to Material mw skin

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329813 )

Change subject: Add jenkins tests to Material mw skin
..

Add jenkins tests to Material mw skin

Change-Id: I17bcc2cfe59793c1d80dcc7f1bb74974d35d95c0
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/329813/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17bcc2cfe59793c1d80dcc7f1bb74974d35d95c0
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Enable translations for the Material skin

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329812 )

Change subject: Enable translations for the Material skin
..

Enable translations for the Material skin

Requires I50828b6056f220d7c44c028f1b9f30a2068b2416

Change-Id: Ie3a4ba1efd85a950e9a33f63a844f49fe418d642
---
M groups/MediaWiki/mediawiki-skins.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/12/329812/2

diff --git a/groups/MediaWiki/mediawiki-skins.txt 
b/groups/MediaWiki/mediawiki-skins.txt
index 72e67bd..023eb68 100644
--- a/groups/MediaWiki/mediawiki-skins.txt
+++ b/groups/MediaWiki/mediawiki-skins.txt
@@ -32,6 +32,9 @@
 Mask
 ignored = mask-menu-left, mask-menu-right, mask-index-url
 
+Material
+optional = material.css, material.js
+
 MediaWiki Strapping
 file = mediawiki-strapping/i18n/%CODE%.json
 descmsg = strapping-desc

-- 
To view, visit https://gerrit.wikimedia.org/r/329812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3a4ba1efd85a950e9a33f63a844f49fe418d642
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Add missing guest message, also add qqq.json

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329811 )

Change subject: Add missing guest message, also add qqq.json
..

Add missing guest message

Change-Id: I50828b6056f220d7c44c028f1b9f30a2068b2416
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Material 
refs/changes/11/329811/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50828b6056f220d7c44c028f1b9f30a2068b2416
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Material
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329802 )

Change subject: DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR
..


DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR

We want to allow the defaults as well as RDFa, not just RDFa.

Change-Id: I160fcd2920544f36691c31173ad7b1b774377c90
---
M src/dm/ve.dm.Change.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Divec: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index 64672d7..c538b3d 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -153,7 +153,7 @@
// Support: IE9
// DOMPurify.sanitize will return html strings in 
incompatible browsers
var fragmentOrHtml = DOMPurify.sanitize( $.parseHTML( 
nodeHtml )[ 0 ], {
-   ALLOWED_ATTR: rdfaAttrs,
+   ADD_ATTR: rdfaAttrs,
ADD_URI_SAFE_ATTR: rdfaAttrs,
FORBID_TAGS: [ 'style' ],
RETURN_DOM_FRAGMENT: true

-- 
To view, visit https://gerrit.wikimedia.org/r/329802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I160fcd2920544f36691c31173ad7b1b774377c90
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Add intro/summery text on top of Special:GlobalRenameUser

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329810 )

Change subject: Add intro/summery text on top of Special:GlobalRenameUser
..

Add intro/summery text on top of Special:GlobalRenameUser

Change-Id: I56942a75f6b571507560690ebb8353f6e90e4012
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/10/329810/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56942a75f6b571507560690ebb8353f6e90e4012
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Remove unnecessary class NewsletterDeletionUpdate

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329804 )

Change subject: Remove unnecessary class NewsletterDeletionUpdate
..


Remove unnecessary class NewsletterDeletionUpdate

The same functionality is already implemented as a hook in
Newsletter.hooks.php

Bug: T154341
Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
---
M extension.json
M includes/content/NewsletterContent.php
D includes/content/NewsletterDeletionUpdate.php
3 files changed, 0 insertions(+), 36 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  MtDu: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 4f9b050..774c4a5 100644
--- a/extension.json
+++ b/extension.json
@@ -85,7 +85,6 @@
"NewsletterContent": "includes/content/NewsletterContent.php",
"NewsletterContentHandler": 
"includes/content/NewsletterContentHandler.php",
"NewsletterDiffEngine": 
"includes/content/NewsletterDiffEngine.php",
-   "NewsletterDeletionUpdate": 
"includes/content/NewsletterDeletionUpdate.php",
"EchoNewsletterUserLocator": 
"includes/Echo/EchoNewsletterUserLocator.php",
"BaseNewsletterPresentationModel": 
"includes/Echo/BaseNewsletterPresentationModel.php",
"EchoNewsletterPresentationModel": 
"includes/Echo/EchoNewsletterPresentationModel.php",
diff --git a/includes/content/NewsletterContent.php 
b/includes/content/NewsletterContent.php
index 0f2bb85..e76847e 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -388,18 +388,6 @@
}
 
/**
-* @param WikiPage $page
-* @param ParserOutput|null $parserOutput
-* @return LinksDeletionUpdate[]
-*/
-   public function getDeletionUpdates( WikiPage $page, ParserOutput 
$parserOutput = null ) {
-   return array_merge(
-   parent::getDeletionUpdates( $page, $parserOutput ),
-   array( new NewsletterDeletionUpdate( 
$page->getTitle()->getText() ) )
-   );
-   }
-
-   /**
 * @return string
 */
public function getDescription() {
diff --git a/includes/content/NewsletterDeletionUpdate.php 
b/includes/content/NewsletterDeletionUpdate.php
deleted file mode 100644
index 69a3042..000
--- a/includes/content/NewsletterDeletionUpdate.php
+++ /dev/null
@@ -1,23 +0,0 @@
-newsletter = Newsletter::newFromName( $newsletterName );
-   }
-
-   public function doUpdate() {
-   $reason = wfMessage( 'newsletter-delete-log', 
$this->newsletter->getName() )->text();
-   $store = NewsletterStore::getDefaultInstance();
-   $store->deleteNewsletter( $this->newsletter, $reason );
-   }
-}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/329804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix display bug with floats on Special:UserBoxes

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329808 )

Change subject: Fix display bug with floats on Special:UserBoxes
..


Fix display bug with floats on Special:UserBoxes

HT SamanthaNguyen

Change-Id: Id434ac4be6eec258bfebd5211a7d0f3232397e69
---
M SpecialFanBoxes.css
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index d1c321c..6d1e674 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -93,6 +93,10 @@
width: 350px;
 }
 
+.add-colors h1 {
+   clear: both;
+}
+
 #add-colors-left {
width: 150px;
margin: 0px 2px 0px 0px;

-- 
To view, visit https://gerrit.wikimedia.org/r/329808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id434ac4be6eec258bfebd5211a7d0f3232397e69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Give focus to preview panel for keyboard scrolling

2016-12-31 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329809 )

Change subject: Give focus to preview panel for keyboard scrolling
..

Give focus to preview panel for keyboard scrolling

Bug: T154334
Change-Id: Ibc093e3111411b6183bf24528a2e0419ba8d40b6
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/09/329809/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 9bba961..6569744 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -217,6 +217,7 @@
break;
case 'preview':
size = 'full';
+   this.previewPanel.$element[ 0 ].focus();
break;
case 'review':
size = 'larger';
@@ -484,7 +485,10 @@
padded: true
} );
this.$previewViewer = $( '' ).addClass( 'mw-body-content 
mw-content-' + mw.config.get( 'wgVisualEditor' ).pageLanguageDir );
-   this.previewPanel.$element.append( this.$previewViewer );
+   this.previewPanel.$element
+   // Make focusable for keyboard accessible scrolling
+   .prop( 'tabIndex', 0 )
+   .append( this.$previewViewer );
 
// Conflict panel
this.conflictPanel = new OO.ui.PanelLayout( {

-- 
To view, visit https://gerrit.wikimedia.org/r/329809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc093e3111411b6183bf24528a2e0419ba8d40b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix display bug with floats on Special:UserBoxes

2016-12-31 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329808 )

Change subject: Fix display bug with floats on Special:UserBoxes
..

Fix display bug with floats on Special:UserBoxes

HT SamanthaNguyen

Change-Id: Id434ac4be6eec258bfebd5211a7d0f3232397e69
---
M SpecialFanBoxes.css
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes 
refs/changes/08/329808/1

diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index d1c321c..6d1e674 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -93,6 +93,10 @@
width: 350px;
 }
 
+.add-colors h1 {
+   clear: both;
+}
+
 #add-colors-left {
width: 150px;
margin: 0px 2px 0px 0px;

-- 
To view, visit https://gerrit.wikimedia.org/r/329808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id434ac4be6eec258bfebd5211a7d0f3232397e69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix typo in unresolved-property-category-desc

2016-12-31 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329807 )

Change subject: Fix typo in unresolved-property-category-desc
..

Fix typo in unresolved-property-category-desc

"can not" -> "cannot"

Change-Id: I36fdbf0875c8f3bce26b3eac9f863ed40ae906b5
---
M client/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/07/329807/2

diff --git a/client/i18n/en.json b/client/i18n/en.json
index b14c365..5c7c152 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -117,5 +117,5 @@
"notification-subject-page-connection": "A page on {{SITENAME}} you 
{{GENDER:$3|created}} was {{GENDER:$2|connected}} to a {{WBREPONAME}} item",
"notification-page-connection-link": "Project:$1",
"unresolved-property-category": "Pages with unresolved properties",
-   "unresolved-property-category-desc": "This category lists pages that 
reference {{WBREPONAME}} properties that can not be found neither by their 
property ID nor label."
+   "unresolved-property-category-desc": "This category lists pages that 
reference {{WBREPONAME}} properties that cannot be found neither by their 
property ID nor label."
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/329807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36fdbf0875c8f3bce26b3eac9f863ed40ae906b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Sn1per 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Replace redundant numeric parameter insertables suggesters

2016-12-31 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329806 )

Change subject: Replace redundant numeric parameter insertables suggesters
..

Replace redundant numeric parameter insertables suggesters

Change-Id: If375259a7e4b996cd0113e936d4884a7be02b5f8
Depends-On: Iac7ff7bdc31e7a648b140349193df9077fcd7031
Bug: T152837
---
M groups/Huggle/Huggle.yaml
D groups/Huggle/Suggester.php
M groups/Intuition/IntuitionAgg.yaml
D groups/Intuition/IntuitionInsertablesSuggester.php
M groups/Intuition/dcatap.yaml
M groups/Intuition/heritage.yaml
M groups/Intuition/orphantalk.yaml
M groups/Intuition/raun.yaml
M groups/Intuition/refill.yaml
M groups/Wikimedia/CopyPatrol.yaml
D groups/Wikimedia/CopyPatrolInsertablesSuggester.php
D groups/wikidata/WikidataInsertablesSuggester.php
M groups/wikidata/wikidata.yaml
13 files changed, 9 insertions(+), 126 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/06/329806/1

diff --git a/groups/Huggle/Huggle.yaml b/groups/Huggle/Huggle.yaml
index d032346..88c6387 100644
--- a/groups/Huggle/Huggle.yaml
+++ b/groups/Huggle/Huggle.yaml
@@ -22,7 +22,4 @@
 - wikiParameterCheck
 
 INSERTABLES:
-  class: HuggleSuggester
-
-AUTOLOAD:
-  HuggleSuggester: Suggester.php
+  class: NumericalParameterInsertablesSuggester
diff --git a/groups/Huggle/Suggester.php b/groups/Huggle/Suggester.php
deleted file mode 100644
index ec2abdf..000
--- a/groups/Huggle/Suggester.php
+++ /dev/null
@@ -1,18 +0,0 @@
-https://gerrit.wikimedia.org/r/329806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If375259a7e4b996cd0113e936d4884a7be02b5f8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Sn1per 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add Timeless skin

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329805 )

Change subject: Add Timeless skin
..

Add Timeless skin

Bug: T154371
Change-Id: Ic3e19d14b5c65a13be76be79dd844d162896e532
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/05/329805/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3e19d14b5c65a13be76be79dd844d162896e532
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Remove unnecessary class NewsletterDeletionUpdate

2016-12-31 Thread Pppery (Code Review)

Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329804 )

Change subject: Remove unnecessary class NewsletterDeletionUpdate
..

Remove unnecessary class NewsletterDeletionUpdate

The same functionality is already implemented as a hook in
Newsletter.hooks.php

Bug: T154341
Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
---
M extension.json
M includes/content/NewsletterContent.php
D includes/content/NewsletterDeletionUpdate.php
3 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/04/329804/1

diff --git a/extension.json b/extension.json
index 4f9b050..774c4a5 100644
--- a/extension.json
+++ b/extension.json
@@ -85,7 +85,6 @@
"NewsletterContent": "includes/content/NewsletterContent.php",
"NewsletterContentHandler": 
"includes/content/NewsletterContentHandler.php",
"NewsletterDiffEngine": 
"includes/content/NewsletterDiffEngine.php",
-   "NewsletterDeletionUpdate": 
"includes/content/NewsletterDeletionUpdate.php",
"EchoNewsletterUserLocator": 
"includes/Echo/EchoNewsletterUserLocator.php",
"BaseNewsletterPresentationModel": 
"includes/Echo/BaseNewsletterPresentationModel.php",
"EchoNewsletterPresentationModel": 
"includes/Echo/EchoNewsletterPresentationModel.php",
diff --git a/includes/content/NewsletterContent.php 
b/includes/content/NewsletterContent.php
index 0f2bb85..e76847e 100644
--- a/includes/content/NewsletterContent.php
+++ b/includes/content/NewsletterContent.php
@@ -388,18 +388,6 @@
}
 
/**
-* @param WikiPage $page
-* @param ParserOutput|null $parserOutput
-* @return LinksDeletionUpdate[]
-*/
-   public function getDeletionUpdates( WikiPage $page, ParserOutput 
$parserOutput = null ) {
-   return array_merge(
-   parent::getDeletionUpdates( $page, $parserOutput ),
-   array( new NewsletterDeletionUpdate( 
$page->getTitle()->getText() ) )
-   );
-   }
-
-   /**
 * @return string
 */
public function getDescription() {
diff --git a/includes/content/NewsletterDeletionUpdate.php 
b/includes/content/NewsletterDeletionUpdate.php
deleted file mode 100644
index 69a3042..000
--- a/includes/content/NewsletterDeletionUpdate.php
+++ /dev/null
@@ -1,23 +0,0 @@
-newsletter = Newsletter::newFromName( $newsletterName );
-   }
-
-   public function doUpdate() {
-   $reason = wfMessage( 'newsletter-delete-log', 
$this->newsletter->getName() )->text();
-   $store = NewsletterStore::getDefaultInstance();
-   $store->deleteNewsletter( $this->newsletter, $reason );
-   }
-}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/329804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1ea8be2ab5e30ce1b0af1233ab9eb2053bfd26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Insertables suggester class for numerical parameters

2016-12-31 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329803 )

Change subject: Insertables suggester class for numerical parameters
..

Insertables suggester class for numerical parameters

Insertables suggester class for numerical parameters such as:
$1, $2, $3text

Factor numerical parameter insertable regex out of
MediaWikiInsertablesSuggester (which now extends the new class)

Bug: T152837
Change-Id: Iac7ff7bdc31e7a648b140349193df9077fcd7031
---
M Autoload.php
M insertables/MediaWikiInsertablesSuggester.php
A insertables/NumericalParameterInsertablesSuggester.php
3 files changed, 33 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/03/329803/1

diff --git a/Autoload.php b/Autoload.php
index 11b6106..c31fdfe 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -320,6 +320,8 @@
  */
 $al['Insertable'] = "$dir/insertables/Insertable.php";
 $al['InsertablesSuggester'] = "$dir/insertables/InsertablesSuggester.php";
+$al['NumericalParameterInsertablesSuggester'] =
+   "$dir/insertables/NumericalParameterInsertablesSuggester.php";
 $al['MediaWikiInsertablesSuggester'] =
"$dir/insertables/MediaWikiInsertablesSuggester.php";
 $al['TranslatablePageInsertablesSuggester'] =
diff --git a/insertables/MediaWikiInsertablesSuggester.php 
b/insertables/MediaWikiInsertablesSuggester.php
index f4a9cbf..1b9a130 100644
--- a/insertables/MediaWikiInsertablesSuggester.php
+++ b/insertables/MediaWikiInsertablesSuggester.php
@@ -10,16 +10,9 @@
  * difficult to type manually.
  * @since 2013.09
  */
-class MediaWikiInsertablesSuggester {
+class MediaWikiInsertablesSuggester extends 
NumericalParameterInsertablesSuggester {
public function getInsertables( $text ) {
-   $insertables = array();
-
-   $matches = array();
-   preg_match_all( '/\$(1[a-z]+|[0-9]+)/', $text, $matches, 
PREG_SET_ORDER );
-   $new = array_map( function( $match ) {
-   return new Insertable( $match[0], $match[0] );
-   }, $matches );
-   $insertables = array_merge( $insertables, $new );
+   $insertables = parent::getInsertables( $text );
 
$matches = array();
preg_match_all(
diff --git a/insertables/NumericalParameterInsertablesSuggester.php 
b/insertables/NumericalParameterInsertablesSuggester.php
new file mode 100644
index 000..b0b529b
--- /dev/null
+++ b/insertables/NumericalParameterInsertablesSuggester.php
@@ -0,0 +1,29 @@
+https://gerrit.wikimedia.org/r/329803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac7ff7bdc31e7a648b140349193df9077fcd7031
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Sn1per 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR

2016-12-31 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329802 )

Change subject: DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR
..

DOMPurify config: Change ALLOWED_ATTR to ADD_ATTR

We want to allow the defaults as well as RDFa, not just RDFa.

Change-Id: I160fcd2920544f36691c31173ad7b1b774377c90
---
M src/dm/ve.dm.Change.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/02/329802/1

diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index 64672d7..c538b3d 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -153,7 +153,7 @@
// Support: IE9
// DOMPurify.sanitize will return html strings in 
incompatible browsers
var fragmentOrHtml = DOMPurify.sanitize( $.parseHTML( 
nodeHtml )[ 0 ], {
-   ALLOWED_ATTR: rdfaAttrs,
+   ADD_ATTR: rdfaAttrs,
ADD_URI_SAFE_ATTR: rdfaAttrs,
FORBID_TAGS: [ 'style' ],
RETURN_DOM_FRAGMENT: true

-- 
To view, visit https://gerrit.wikimedia.org/r/329802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I160fcd2920544f36691c31173ad7b1b774377c90
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecated Title::moveNoAuth function

2016-12-31 Thread Awu42 (Code Review)

Awu42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329801 )

Change subject: Removed deprecated Title::moveNoAuth function
..

Removed deprecated Title::moveNoAuth function

(deprecated since 1.25)

Bug: T61113
Change-Id: I7a007dd87ea3bcbb1121738c84b0e654ba17ccbf
---
M RELEASE-NOTES-1.29
M includes/Title.php
2 files changed, 1 insertion(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/329801/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 9e3cfac..a00525c 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -149,6 +149,7 @@
 * FSRepo (deprecated in 1.19) was removed.
 * WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. Use
 \MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() 
instead.
+* Title::moveNoAuth() (deprecated in 1.25) was removed. Use MovePage class 
instead.
 
 == Compatibility ==
 
diff --git a/includes/Title.php b/includes/Title.php
index 1125f23..4d496e4 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3610,18 +3610,6 @@
}
 
/**
-* Move this page without authentication
-*
-* @deprecated since 1.25 use MovePage class instead
-* @param Title $nt The new page Title
-* @return array|bool True on success, getUserPermissionsErrors()-like 
array on failure
-*/
-   public function moveNoAuth( &$nt ) {
-   wfDeprecated( __METHOD__, '1.25' );
-   return $this->moveTo( $nt, false );
-   }
-
-   /**
 * Check whether a given move operation would be valid.
 * Returns true if ok, or a getUserPermissionsErrors()-like array 
otherwise
 *

-- 
To view, visit https://gerrit.wikimedia.org/r/329801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a007dd87ea3bcbb1121738c84b0e654ba17ccbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awu42 <9922y...@gmail.com>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Move Page Tools to the left side

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329799 )

Change subject: Move Page Tools to the left side
..

Move Page Tools to the left side

also make page size in the middle bigger to the right due to the move

Change-Id: Ic273d4e976c79c6d3fef582f1789d4779004879f
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/99/329799/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic273d4e976c79c6d3fef582f1789d4779004879f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove WebRequest::checkSessionCookie() method as being depr...

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329511 )

Change subject: Remove WebRequest::checkSessionCookie() method as being 
deprecated
..


Remove WebRequest::checkSessionCookie() method as being deprecated

Bug: T61113
Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
---
M RELEASE-NOTES-1.29
M includes/DerivativeRequest.php
M includes/WebRequest.php
3 files changed, 2 insertions(+), 20 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..9e3cfac 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. Use
+\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() 
instead.
 
 == Compatibility ==
 
diff --git a/includes/DerivativeRequest.php b/includes/DerivativeRequest.php
index 4c149ae..487e86c 100644
--- a/includes/DerivativeRequest.php
+++ b/includes/DerivativeRequest.php
@@ -49,10 +49,6 @@
return $this->base->getCookie( $key, $prefix, $default );
}
 
-   public function checkSessionCookie() {
-   return $this->base->checkSessionCookie();
-   }
-
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index e7c9b83..3bbdc3f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -758,22 +758,6 @@
}
 
/**
-* Returns true if the request has a persistent session.
-* This does not necessarily mean that the user is logged in!
-*
-* @deprecated since 1.27, use
-*  
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
-*  instead.
-* @return bool
-*/
-   public function checkSessionCookie() {
-   global $wgInitialSessionId;
-   wfDeprecated( __METHOD__, '1.27' );
-   return $wgInitialSessionId !== null &&
-   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
-   }
-
-   /**
 * Get a cookie from the $_COOKIE jar
 *
 * @param string $key The name of the cookie

-- 
To view, visit https://gerrit.wikimedia.org/r/329511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Victorbarbu 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Replace deprecated mediawiki.UI Less variables with current ...

2016-12-31 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329800 )

Change subject: Replace deprecated mediawiki.UI Less variables with current ones
..

Replace deprecated mediawiki.UI Less variables with current ones

Replacing variables, which have been deprecated since MW 1.24,
with fix color values for now. This is an intermediate step in
order to proceed with planned WMUI Base variables usage.
Also aligning code to CSS Coding Guidelines and making use of
`.box-sizing()` global Less mixin.

Bug: T154362
Change-Id: Idd90a4fa56d55f545f978dc68dd86adc0e77eb53
---
M styles/link.less
1 file changed, 15 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/00/329800/1

diff --git a/styles/link.less b/styles/link.less
index 25b346f..2f44edb 100644
--- a/styles/link.less
+++ b/styles/link.less
@@ -1,10 +1,9 @@
-@import 'mediawiki.ui/variables';
 @import 'mediawiki.mixins';
 
 /* stylelint-disable no-descending-specificity */
 .mw-kartographer-link,
 .mw-kartographer-maplink {
-   &::not(.mw-kartographer-map) {
+   &:not( .mw-kartographer-map ) {
display: inline;
}
cursor: pointer;
@@ -13,8 +12,7 @@
 // The icon only applies to  types of `.mw-kartographer-link`
 .mw-kartographer-maplink,
 a.mw-kartographer-link {
-
-   
&:not(.mw-kartographer-autostyled):not(.mw-kartographer-map):not(.no-icon) {
+   &:not( .mw-kartographer-autostyled ):not( .mw-kartographer-map ):not( 
.no-icon ) {
/**
 * These two files were copied from OOjs UI repository after 
the build process
 * generated the progressive icons.
@@ -24,7 +22,7 @@
 * The master version of the icon is at:
 *   
https://github.com/wikimedia/oojs-ui/blob/master/src/themes/mediawiki/images/icons/mapPin.svg
 */
-   .background-image-svg('images/mapPin-progressive.svg', 
'images/mapPin-progressive.png');
+   .background-image-svg( 'images/mapPin-progressive.svg', 
'images/mapPin-progressive.png' );
background-position: left -3px;
background-repeat: no-repeat;
background-size: 18px 18px;
@@ -43,10 +41,9 @@
 .skin-minerva {
a.mw-kartographer-link,
.mw-kartographer-maplink {
-
-   
&:not(.mw-kartographer-autostyled):not(.mw-kartographer-map):not(.no-icon) {
-   padding-left: 20px;
+   &:not( .mw-kartographer-autostyled ):not( .mw-kartographer-map 
):not( .no-icon ) {
background-size: 20px 20px;
+   padding-left: 20px;
}
 
// One can display an iconless link by adding `class="no-icon"`
@@ -60,10 +57,10 @@
 
 .mw-kartographer-map:hover {
.mw-kartographer-fullScreen {
-   background-color: @colorWhite;
+   background-color: #fff;
}
.oo-ui-buttonElement-button {
-   background-color: @colorWhite;
+   background-color: #fff;
}
 }
 
@@ -75,8 +72,8 @@
cursor: pointer;
}
 
-   .mw-kartographer-maplink:not(.mw-kartographer-link),
-   
.mw-kartographer-map:not(.mw-kartographer-link):not(.mw-kartographer-interactive)
 {
+   .mw-kartographer-maplink:not( .mw-kartographer-link ),
+   .mw-kartographer-map:not( .mw-kartographer-link ):not( 
.mw-kartographer-interactive ) { // stylelint bug
pointer-events: none;
cursor: default;
}
@@ -86,26 +83,22 @@
  * If `$wgKartographerUseMarkerStyle = true`.
  */
 a.mw-kartographer-autostyled {
+   color: #fff;
display: inline-block;
-
position: relative;
top: -0.08em;
-
-   box-sizing: content-box;
+   .box-sizing ( content-box );
height: 0.85em;
-   border-radius: 1px;
-
margin-left: 0;
+   border-radius: 1px;
padding: 0.24em 0.42em;
-
-   color: @colorWhite;
font-size: 0.85em;
font-weight: bold;
line-height: 1;
text-align: center;
vertical-align: middle;
-}
 
-a.mw-kartographer-autostyled:visited {
-   color: @colorWhite;
+   &:visited {
+   color: #fff;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/329800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd90a4fa56d55f545f978dc68dd86adc0e77eb53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Remove old SpecialUpload.1.21.3.php

2016-12-31 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329798 )

Change subject: Remove old SpecialUpload.1.21.3.php
..

Remove old SpecialUpload.1.21.3.php

Bug: T154363
Change-Id: I663d754784cf5f3b65fc05b0027acceed278e7fd
---
M SpecialMultiUpload.php
D SpecialUpload.1.21.3.php
2 files changed, 4 insertions(+), 1,308 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiUpload 
refs/changes/98/329798/1

diff --git a/SpecialMultiUpload.php b/SpecialMultiUpload.php
index 1d60160..49d40cd 100644
--- a/SpecialMultiUpload.php
+++ b/SpecialMultiUpload.php
@@ -27,17 +27,10 @@
 
 /* use the local, patched version of SpecialUpload.php for now */
 global $wgVersion;
-if ( version_compare( $wgVersion, '1.22', '<' ) ) {
-   $wgAutoloadLocalClasses['SpecialUpload']
-   = $wgAutoloadLocalClasses['UploadForm']
-   = $wgAutoloadLocalClasses['UploadSourceField']
-   = __DIR__ . '/SpecialUpload.1.21.3.php';
-} else {
-   $wgAutoloadLocalClasses['SpecialUpload']
-   = $wgAutoloadLocalClasses['UploadForm']
-   = $wgAutoloadLocalClasses['UploadSourceField']
-   = __DIR__ . '/SpecialUpload.php';
-}
+$wgAutoloadLocalClasses['SpecialUpload']
+   = $wgAutoloadLocalClasses['UploadForm']
+   = $wgAutoloadLocalClasses['UploadSourceField']
+   = __DIR__ . '/SpecialUpload.php';
 
 /**
  * Special page for uploading multiple files in one submission.
diff --git a/SpecialUpload.1.21.3.php b/SpecialUpload.1.21.3.php
deleted file mode 100644
index 2a3ff91..000
--- a/SpecialUpload.1.21.3.php
+++ /dev/null
@@ -1,1297 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup SpecialPage
- * @ingroup Upload
- */
-
-/**
- * Form for handling uploads and special page.
- *
- * @ingroup SpecialPage
- * @ingroup Upload
- */
-class SpecialUpload extends SpecialPage {
-   /**
-* Constructor : initialise object
-* Get data POSTed through the form and assign them to the object
-* @param $request WebRequest : data posted.
-*/
-   public function __construct( $request = null ) {
-   parent::__construct( 'Upload', 'upload' );
-   }
-
-   /** Misc variables **/
-   public $mRequest; // The WebRequest or FauxRequest this form is 
supposed to handle
-   public $mSourceType;
-
-   /**
-* @var UploadBase
-*/
-   public $mUpload;
-
-   /**
-* @var LocalFile
-*/
-   public $mLocalFile;
-   public $mUploadClicked;
-
-   /** User input variables from the "description" section **/
-   public $mDesiredDestName; // The requested target file name
-   public $mComment;
-   public $mLicense;
-
-   /** User input variables from the root section **/
-   public $mIgnoreWarning;
-   public $mWatchThis;
-   public $mCopyrightStatus;
-   public $mCopyrightSource;
-
-   /** Hidden variables **/
-   public $mDestWarningAck;
-   public $mForReUpload; // The user followed an "overwrite this file" link
-   public $mCancelUpload; // The user clicked "Cancel and return to upload 
form" button
-   public $mTokenOk;
-   public $mUploadSuccessful = false; // Subclasses can use this to 
determine whether a file was uploaded
-
-   /** Text injection points for hooks not using HTMLForm **/
-   public $uploadFormTextTop;
-   public $uploadFormTextAfterSummary;
-
-   public $mWatchthis;
-
-   /**
-* Initialize instance variables from request and create an Upload 
handler
-*/
-   protected function loadRequest() {
-   $this->mRequest = $request = $this->getRequest();
-   $this->mSourceType = $request->getVal( 'wpSourceType', 'file' );
-   $this->mUpload = UploadBase::createFromRequest( $request );
-   $this->mUploadClicked = $request->wasPosted()
-   && ( $request->getCheck( 'wpUpload' )
-   || $request->getCheck( 'wpUploadIgnoreWarning' 
) );
-
-   // Guess the desired name from the filename if not provided
-   $this->mDesiredDestName = $request->getText( 'wpDestFile' );
-   if ( !$this->mDesiredDestName && $request->getFileName( 
'wpUploadFile' ) !== null ) {
-   $this->mDesiredDestName = $request->getFileName( 
'wpUploadFile' );
-   }
-   $this->mComment = $request->getText( 'wpUploadDescription' );
-   $this->mLicense = $request->getText( 'wpLicense' );
-
-   $this->mDestWarningAck = $request->getText( 
'wpDestFileWarningAck' );
-   $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' )
-   || $request->getCheck( 'wpUploadIgnoreWarning' );
-   $this->mWatchthis = $request->getBool(

[MediaWiki-commits] [Gerrit] mediawiki...OfflineImportLexicon[master]: Replaced deprecated "Article::doEdit"

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329789 )

Change subject: Replaced deprecated "Article::doEdit"
..


Replaced deprecated "Article::doEdit"

Bug: T151973
Change-Id: I61736a07763a262b5a87aef887b09d9d1d7a826a
---
M OfflineImportLexicon_body.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/OfflineImportLexicon_body.php b/OfflineImportLexicon_body.php
index 65459d9..e8c68f3 100644
--- a/OfflineImportLexicon_body.php
+++ b/OfflineImportLexicon_body.php
@@ -326,7 +326,8 @@
 
$article = new Article($titleObj);
$flags = $flags|EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY;
-   $status = $article->doEdit( $content, $summary, 
$flags,false,$wgUser);
+   $articleContent = ContentHandler::makeContent( $content, 
$titleObj );
+   $status = $article->doEditContent( $articleContent, $summary, 
$flags, false, $wgUser);
$result = true;
if ( !$status->isOK() ) {
$result = $status->getErrorsArray();

-- 
To view, visit https://gerrit.wikimedia.org/r/329789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61736a07763a262b5a87aef887b09d9d1d7a826a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OfflineImportLexicon
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SemanticComments[master]: Replaced deprecated "Article::doEdit"

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329791 )

Change subject: Replaced deprecated "Article::doEdit"
..


Replaced deprecated "Article::doEdit"

Bug: T151973
Change-Id: I8b24efa629379fa89b135dafd550d427be429939
---
M specials/Comment/CE_Comment.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/specials/Comment/CE_Comment.php b/specials/Comment/CE_Comment.php
index f7044eb..5ef2344 100644
--- a/specials/Comment/CE_Comment.php
+++ b/specials/Comment/CE_Comment.php
@@ -119,7 +119,8 @@
$summary = wfMessage( 'ce_com_create_sum' 
)->text();
}
$pageContent = str_replace( '##DATE##', $dateString, 
$pageContent );
-   $article->doEdit( $pageContent, $summary );
+   $pageContentObject = ContentHandler::makeContent( 
$pageContent, $title );
+   $article->doEditContent( $pageContentObject, $summary );
 
if ( $article->exists() ) {
self::updateRelatedArticle( $pageContent );

-- 
To view, visit https://gerrit.wikimedia.org/r/329791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b24efa629379fa89b135dafd550d427be429939
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SemanticComments
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329788 )

Change subject: Replace deprecated Article::doEdit()
..


Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: Iba294e14ba00c836fe5451654a7a3e15028a6c8e
---
M FanBoxClass.php
1 file changed, 15 insertions(+), 10 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FanBoxClass.php b/FanBoxClass.php
index c03c898..bfb4f02 100644
--- a/FanBoxClass.php
+++ b/FanBoxClass.php
@@ -88,11 +88,7 @@
trim( $category ) . "]]\n";
}
}
-   $article = new Article( $this->title );
-
-   $article_content = $this->buildWikiText() . "\n\n" .
-   $this->getBaseCategories() . "\n" . $categories_wiki .
-   "\n__NOEDITSECTION__";
+   $page = WikiPage::factory( $this->title );
 
if ( $descTitle->exists() ) {
# Invalidate the cache for the description page
@@ -100,7 +96,13 @@
$descTitle->purgeSquid();
} else {
// New fantag; create the description page.
-   $article->doEdit( $this->buildWikiText() . "\n\n" . 
$article_content, $desc );
+   $pageContent = ContentHandler::makeContent(
+   $this->buildWikiText() . "\n\n" .
+   $this->getBaseCategories() . "\n" . 
$categories_wiki .
+   "\n__NOEDITSECTION__",
+   $page->getTitle()
+   );
+   $page->doEditContent( $pageContent, $desc );
}
 
# Test to see if the row exists using INSERT IGNORE
@@ -215,13 +217,16 @@
':' . trim( $category ) . "]]\n";
}
}
-   $article = new Article( $this->title );
+   $page = WikiPage::factory( $this->title );
 
-   $article_content = $this->buildWikiText() . "\n" .
+   $pageContent = ContentHandler::makeContent(
+   $this->buildWikiText() . "\n" .
$this->getBaseCategories() . "\n" . $categories_wiki .
-   "\n__NOEDITSECTION__";
+   "\n__NOEDITSECTION__",
+   $page->getTitle()
+   );
 
-   $article->doEdit( $article_content, wfMessage( 
'fanbox-summary-update' )->inContentLanguage()->parse() );
+   $page->doEditContent( $pageContent, wfMessage( 
'fanbox-summary-update' )->inContentLanguage()->parse() );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/329788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba294e14ba00c836fe5451654a7a3e15028a6c8e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Replace deprecated mediawiki.UI Less variables with current ...

2016-12-31 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329797 )

Change subject: Replace deprecated mediawiki.UI Less variables with current ones
..

Replace deprecated mediawiki.UI Less variables with current ones

Replacing mediawiki.UI Less variables, which have been deprecated
since MW 1.24, with current ones. This is an intermediate step
in preparing to move towards WMUI Base variables and to cleanly
finish the deprecation process.
Also replacing fixed values with other current variables, like
`border-radius`, align values with OOjs UI values and clean-up
Less code in respect of CSS coding guidelines.

Bug: T154362
Change-Id: If94b4b334680e43f0a3552067b63f52139cfaf3a
---
M styles/common.less
1 file changed, 30 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph 
refs/changes/97/329797/1

diff --git a/styles/common.less b/styles/common.less
index d90748a..329fb86 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -2,8 +2,7 @@
 @import 'mediawiki.mixins';
 @import 'mediawiki.mixins.animation';
 
-@darkColor:  #2b333f;
-@darkColorOpac: rgba( 43, 51, 63, 0.7 );
+@colorWhite: #fff;
 @colorWhiteOpac: rgba( 255, 255, 255, 0.7 );
 
 /* TODO: This file has a lot of descending specificity and needs a cleanup */
@@ -23,7 +22,6 @@
}
 
&.mw-graph-interactable {
-
&:hover {
cursor: pointer;
 
@@ -82,10 +80,9 @@
/* common button style */
.mw-graph-switch {
font: inherit;
-   margin: 0.1em 0;
min-height: 1.2em;
min-width: 1em;
-   .transition( ~'background .1s ease,color .1s ease,border-color 
.1s ease,box-shadow .1s ease' );
+   .transition( ~'background-color 100ms, color 100ms, 
border-color 100ms, box-shadow 100ms' );
font-weight: bold;
text-decoration: none;
display: inline-block;
@@ -96,28 +93,27 @@
line-height: 1em;
padding: 0.5em;
width: 60px;
-
border-width: 2px;
border-style: solid;
-   border-color: #333;
-   border-radius: 0.3em;
-
-   color: @darkColor;
+   border-color: @colorGray5;
+   border-radius: @borderRadius;
background-color: @colorWhiteOpac;
+   color: @colorGray2;
 
&:hover {
-   background: @colorProgressiveHighlight;
-   border-color: @colorProgressiveHighlight;
+   background-color: @colorWhite;
+   color: @colorProgressive;
+   border-color: #859dcc;
}
&:active {
-   color: @colorWhite;
-   background-color: @colorProgressiveActive;
+   background-color: @colorWhite;
+   color: @colorProgressive;
border-color: @colorProgressiveActive;
-   .box-shadow(none);
+   .box-shadow( none );
}
&:focus {
-   .box-shadow( ~'inset 0 0 0 1px @{colorWhite}' );
border-color: @colorProgressive;
+   .box-shadow( ~'inset 0 0 0 1px @{colorWhite}' );
}
 
/* Play button style */
@@ -131,28 +127,26 @@
font-style: normal;
}
 
-   }
+   /* Loading button style */
+   &.mw-graph-loading {
+   background-color: @colorWhite;
+   /* @embed */
+   background-image: url( ../includes/ajax-loader.gif );
+   background-position: 50% 50%;
+   background-repeat: no-repeat;
+   background-size: 20px;
+   color: @colorGray5;
+   display: block;
+   border-color: @colorProgressiveActive;
+   .transition( ~'background 0s ease' );
 
-   /* Loading button style */
-   .mw-graph-switch.mw-graph-loading {
+   &:hover {
+   border-color: #859dcc;
+   }
 
-   color: @colorGray5;
-   background-color: @colorWhite;
-   border-color: @colorProgressiveActive;
-
-   &:hover {
-   border-color: #333;
-   }
-   .transition( ~'background 0s ease' );
-   background-position: 50% 50%;
-   background-size: 20px;
-   background-repeat: no-repeat;
-   /* @embed */
-   background-image: url(

[MediaWiki-commits] [Gerrit] mediawiki...PageSchemas[master]: Removed deprecated "Article::doEdit"

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329790 )

Change subject: Removed deprecated "Article::doEdit"
..


Removed deprecated "Article::doEdit"

Bug: T151973
Change-Id: Ib3e2cb5def631ff13e0ff337ee990cfaca840379
---
M PS_CreatePageJob.php
1 file changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PS_CreatePageJob.php b/PS_CreatePageJob.php
index 713810d..05bdaec 100644
--- a/PS_CreatePageJob.php
+++ b/PS_CreatePageJob.php
@@ -49,16 +49,11 @@
$actual_user = $wgUser;
$wgUser = User::newFromId( $this->params['user_id'] );
$edit_summary = wfMessage( 'ps-generatepages-editsummary' 
)->inContentLanguage()->parse();
-   if ( method_exists( 'WikiPage', 'getContent' ) ) {
-   // MW >= 1.21
-   $content = new WikitextContent( $page_text );
-   $wikiPage->doEditContent( $content, $edit_summary );
-   } else {
-   $article->doEdit( $page_text, $edit_summary );
-   }
+   $content = new WikitextContent( $page_text );
+   $wikiPage->doEditContent( $content, $edit_summary );
+
$wgUser = $actual_user;
wfProfileOut( __METHOD__ );
return true;
}
 }
-

-- 
To view, visit https://gerrit.wikimedia.org/r/329790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3e2cb5def631ff13e0ff337ee990cfaca840379
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageSchemas
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SemanticImageAnnotator[master]: Replaced deprecated "Article::doEdit"

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329792 )

Change subject: Replaced deprecated "Article::doEdit"
..


Replaced deprecated "Article::doEdit"

Bug: T151973
Change-Id: I8873109e192e9786ec6a5100ff836617a0537efe
---
M SIA_AjaxFunctions.php
1 file changed, 10 insertions(+), 9 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SIA_AjaxFunctions.php b/SIA_AjaxFunctions.php
index 9a0dca7..3c96e79 100644
--- a/SIA_AjaxFunctions.php
+++ b/SIA_AjaxFunctions.php
@@ -10,8 +10,8 @@
$article->doDelete('ImageAnnotation removed');
return($annotationID);
 }
-   
-function writeAnnotationProperties($newPageName, $annotatedImage, $imageURL, 
$coords,$createdBy){
+
+function writeAnnotationProperties($newPageName, $annotatedImage, $imageURL, 
$coords, $createdBy){
$newTitle = Title::newFromText($newPageName);
$newArticle = new Article($newTitle);
$content = '';
@@ -21,7 +21,8 @@
$content .= '[[SIArectangleCoordinates::'.$coords.'| ]]'."\n";
$content .= '[[SIAcreatedBy::'.$createdBy.'| ]]'."\n";
$content .= '[[Category:ImageAnnotation]]'."\n";
-   $newArticle->doEdit($content, 'Created by Semantic Image Annotator');
+   $contentObject = ContentHandler::makeContent( $content, $newTitle );
+   $newArticle->doEditContent($contentObject, 'Created by Semantic Image 
Annotator');
return ('success');
 }
 
@@ -35,7 +36,7 @@
 $new = version_compare($vers, '1.7', '>=');
 }
 }
-
+
 $returnString = '{"shapes":[';
 $queryString = '[[SIAannotatedImage::'.$annotatedImage.']]';
 $params = array();
@@ -43,7 +44,7 @@
 $params['mainlabel'] = 'result';
 #$params = ['order'];
 #$params = ['sort'];
-
+
if($new){
 $params['order'] = array('asc');
 $params['sort'] = array('SIAannotatedImage');
@@ -52,7 +53,7 @@
 $params['order'] = 'asc';
 $params['sort'] = 'SIAannotatedImage';
 }
-
+
//Generate all the extra printouts, eg all properties to retrieve:
$printmode = SMWPrintRequest::PRINT_PROP;
$customPrintouts = array(   'coordinates'   => 
'SIArectangleCoordinates',
@@ -69,17 +70,17 @@
$query  = SMWQueryProcessor::createQuery( $queryString, $params, 
$context, $format, $extraprintouts );
$store = smwfGetStore(); // default store
$res = $store->getQueryResult( $query );
-   
+
$shapeCounter = 0;
while( ($resArrayArray = $res->getNext()) != false){//Array of 
SMWResultArray Objects, eg. all retrieved Pages
$shapeCounter++;
 
if($shapeCounter > 1) $returnString.=',';
$returnString.='{';
-   foreach($resArrayArray as $resArray){   
//SMWResultArray-Object, column of resulttable (pagename or propertyvalue)  

+   foreach($resArrayArray as $resArray){   
//SMWResultArray-Object, column of resulttable (pagename or propertyvalue)
$currentPrintRequestLabel = 
$resArray->getPrintRequest()->getLabel();   //The label as defined in the above 
array
if($currentPrintRequestLabel == 'coordinates'){
-   $currentResultPage = 
$resArray->getResultSubject(); 
+   $currentResultPage = 
$resArray->getResultSubject();
$currentID = 
$currentResultPage->getTitle()->getFullText();
$currentCoords = 
$resArray->getNextDataItem()->getSerialization();

$returnString.='"coords":"'.$currentCoords.'","id":"'.$currentID.'"';

-- 
To view, visit https://gerrit.wikimedia.org/r/329792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8873109e192e9786ec6a5100ff836617a0537efe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticImageAnnotator
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add editintro to notices

2016-12-31 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329796 )

Change subject: Add editintro to notices
..

Add editintro to notices

Bug: T56029
Bug: T51622
Change-Id: Ib43cc66b817ff394b4f1c82fcba4503df825819c
---
M ApiVisualEditor.php
M modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
2 files changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/96/329796/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index dd8eef2..1c40bd9 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -298,6 +298,19 @@
)->parseAsBlock();
}
 
+   // From EditPage#showCustomIntro
+   if ( $params['editintro'] ) {
+   $editintroTitle = Title::newFromText( 
$params['editintro'] );
+   if ( $editintroTitle instanceof Title 
&& $editintroTitle->exists() && $editintroTitle->userCan( 'read' ) ) {
+   global $wgParser;
+   $notices[] = $wgParser->parse(
+   '{{:' . $editintroTitle->getFullText() . '}}',
+   $title,
+   new ParserOptions()
+   )->getText();
+   }
+   }
+
// Old revision notice
if ( $restoring ) {
$notices[] = $this->msg( 'editingold' 
)->parseAsBlock();
@@ -601,6 +614,7 @@
'wikitext' => null,
'section' => null,
'oldid' => null,
+   'editintro' => null,
'pst' => false,
];
}
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
index 804f874..f0a1a08 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetLoader.js
@@ -130,7 +130,8 @@
action: 'visualeditor',
paction: ( conf.fullRestbaseUrl || 
conf.restbaseUrl ) ? 'metadata' : 'parse',
page: pageName,
-   uselang: mw.config.get( 
'wgUserLanguage' )
+   uselang: mw.config.get( 
'wgUserLanguage' ),
+   editintro: new mw.Uri().query.editintro
};
 
// Only request the API to explicitly load the 
currently visible revision if we're restoring
@@ -249,7 +250,8 @@
action: 'visualeditor',
paction: 'wikitext',
page: pageName,
-   uselang: mw.config.get( 'wgUserLanguage' )
+   uselang: mw.config.get( 'wgUserLanguage' ),
+   editintro: new mw.Uri().query.editintro
};
 
// section should never really be undefined, but check 
just in case

-- 
To view, visit https://gerrit.wikimedia.org/r/329796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib43cc66b817ff394b4f1c82fcba4503df825819c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329795 )

Change subject: Replace deprecated Article::doEdit()
..


Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage".

Bug: T151973
Change-Id: Ic0d2e01724efa65af2f00b82a058974a98316724
---
M LinkClass.php
1 file changed, 11 insertions(+), 4 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/LinkClass.php b/LinkClass.php
index c0df7eb..6527dd0 100644
--- a/LinkClass.php
+++ b/LinkClass.php
@@ -126,9 +126,16 @@
 
// Create the wiki page for the newly-approved link
$linkTitle = Title::makeTitleSafe( NS_LINK, $link['title'] );
-   $article = new Article( $linkTitle );
-   $article->doEdit( $link['url'], wfMessage( 
'linkfilter-edit-summary' )->inContentLanguage()->text() );
-   $newPageId = $article->getID();
+   $page = WikiPage::factory( $linkTitle );
+   $pageContent = ContentHandler::makeContent(
+   $link['url'],
+   $page->getTitle()
+   );
+   $page->doEditContent(
+   $pageContent,
+   wfMessage( 'linkfilter-edit-summary' 
)->inContentLanguage()->text()
+   );
+   $newPageID = $page->getID();
 
// Tie link record to wiki page
$dbw = wfGetDB( DB_MASTER );
@@ -140,7 +147,7 @@
$dbw->update(
'link',
/* SET */array(
-   'link_page_id' => intval( $newPageId ),
+   'link_page_id' => intval( $newPageID ),
'link_approved_date' => $date
),
/* WHERE */array( 'link_id' => intval( $id ) ),

-- 
To view, visit https://gerrit.wikimedia.org/r/329795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0d2e01724efa65af2f00b82a058974a98316724
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...DynamicPageList[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329786 )

Change subject: Replace deprecated Article::doEdit()
..


Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: If84b4c43bc69f12b9cb345558c611d4ebff795b3
---
M DPL.php
M DPLSetup.php
2 files changed, 14 insertions(+), 5 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  Filip: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/DPL.php b/DPL.php
index ff1b352..1b9357b 100644
--- a/DPL.php
+++ b/DPL.php
@@ -1068,9 +1068,14 @@
$titleX = Title::newFromText( $title );
$permissionErrors = $titleX->getUserPermissionsErrors( 'edit', 
$wgUser );
if ( count( $permissionErrors ) == 0 ) {
-   $articleX = new Article( $titleX );
-   $articleX->doEdit( $text, $summary, EDIT_UPDATE | 
EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY );
-   $wgOut->redirect( $titleX->getFullURL( 
$articleX->isRedirect() ? 'redirect=no' : '' ) );
+   $pageX = WikiPage::factory( $titleX );
+   $pageXContent = ContentHandler::makeContent( $text, 
$pageX->getTitle() );
+   $pageX->doEditContent(
+   $pageXContent,
+   $summary,
+   EDIT_UPDATE | EDIT_DEFER_UPDATES | 
EDIT_AUTOSUMMARY
+   );
+   $wgOut->redirect( $titleX->getFullURL( 
$pageX->isRedirect() ? 'redirect=no' : '' ) );
return '';
} else {
$wgOut->showPermissionsErrorPage( $permissionErrors );
diff --git a/DPLSetup.php b/DPLSetup.php
index 8bbe0a1..9d2ef16 100644
--- a/DPLSetup.php
+++ b/DPLSetup.php
@@ -1232,11 +1232,15 @@
$title = Title::newFromText( 'Template:Extension DPL' );
global $wgUser;
if ( !$title->exists() && $wgUser->isAllowed( 'edit' ) 
) {
-   $article = new Article( $title );
-   $article->doEdit(
+   $page = WikiPage::factory( $title );
+   $pageContent = ContentHandler::makeContent(
"This page was automatically 
created. It serves as an anchor page for " .
"all 
'''[[Special:WhatLinksHere/Template:Extension_DPL|invocations]]''' " .
"of 
[http://mediawiki.org/wiki/Extension:DynamicPageList Extension:DynamicPageList 
(DPL)].",
+   $page->getTitle()
+   );
+   $page->doEditContent(
+   $pageContent,
$title,
EDIT_NEW | EDIT_FORCE_BOT
);

-- 
To view, visit https://gerrit.wikimedia.org/r/329786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If84b4c43bc69f12b9cb345558c611d4ebff795b3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DynamicPageList
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329783 )

Change subject: Replace deprecated Article::doEdit()
..


Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: I0e7b6006e6ce7d8a372e2ca09f31a87e1f8c75db
---
M SpecialCreateBlogPost.php
1 file changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  Filip: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index d179011..7f53905 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -101,8 +101,8 @@
$today = $wgContLang->date( wfTimestampNow() );
 
// Create the blog page if it doesn't already exist
-   $article = new Article( $title, 0 );
-   if ( $article->exists() ) {
+   $page = WikiPage::factory( $title );
+   if ( $page->exists() ) {
$out->setPageTitle( $this->msg( 
'errorpagetitle' ) );
$out->addWikiMsg( 
'blog-create-error-page-exists' );
$out->addReturnTo( $this->getPageTitle() );
@@ -139,7 +139,7 @@
$wikitextCategories = implode( "\n", 
$categories );
 
// Perform the edit
-   $article->doEdit(
+   $pageContent = ContentHandler::makeContent(
// Instead of , Wikia had 
Template:Blog Top over
// here and Template:Blog Bottom at the 
bottom, where we
// have the comments tag right now
@@ -147,10 +147,14 @@
$request->getVal( 'pageBody' ) 
. "\n\n" .
'' . "\n\n" . 
$wikitextCategories .
"\n__NOEDITSECTION__",
+   $page->getTitle()
+   );
+   $page->doEditContent(
+   $pageContent,
$this->msg( 'blog-create-summary' 
)->inContentLanguage()->text()
);
 
-   $articleId = $article->getID();
+   $pageID = $page->getID();
// Add a vote for the page
// This was originally in its own global 
function,
// wfFinishCreateBlog and after that in the 
BlogHooks class but
@@ -160,7 +164,7 @@
// Using OutputPageBeforeHTML hook, which, 
according to its
// manual page, runs on *every* page view was 
such a stupid
// idea IMHO.
-   $vote = new Vote( $articleId );
+   $vote = new Vote( $pageID );
$vote->insert( 1 );
 
$stats = new UserStatsTrack( $user->getID(), 
$user->getName() );

-- 
To view, visit https://gerrit.wikimedia.org/r/329783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e7b6006e6ce7d8a372e2ca09f31a87e1f8c75db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Replaced deprecated Article::doEdit(

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329787 )

Change subject: Replaced deprecated Article::doEdit(
..


Replaced deprecated Article::doEdit(

Bug: T151973
Change-Id: Iaa729e81397bacd900ad389d439bfbaf60dabeb8
---
M import/import-parsed-discussions.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/import/import-parsed-discussions.php 
b/import/import-parsed-discussions.php
index 3011668..c670007 100644
--- a/import/import-parsed-discussions.php
+++ b/import/import-parsed-discussions.php
@@ -79,7 +79,7 @@
 
$root = new Article( $title, 0 );
 
-   $root->doEdit(
+   $root->doEditContent(
ContentHandler::makeContent( $info['content'], $title ),
'Imported from JSON',
EDIT_NEW,

-- 
To view, visit https://gerrit.wikimedia.org/r/329787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa729e81397bacd900ad389d439bfbaf60dabeb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329795 )

Change subject: Replace deprecated Article::doEdit()
..

Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage".

Bug: T151973
Change-Id: Ic0d2e01724efa65af2f00b82a058974a98316724
---
M LinkClass.php
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkFilter 
refs/changes/95/329795/1

diff --git a/LinkClass.php b/LinkClass.php
index c0df7eb..8fa0c2f 100644
--- a/LinkClass.php
+++ b/LinkClass.php
@@ -126,9 +126,12 @@
 
// Create the wiki page for the newly-approved link
$linkTitle = Title::makeTitleSafe( NS_LINK, $link['title'] );
-   $article = new Article( $linkTitle );
-   $article->doEdit( $link['url'], wfMessage( 
'linkfilter-edit-summary' )->inContentLanguage()->text() );
-   $newPageId = $article->getID();
+   $page = WikiPage::factory( $linkTitle );
+   $page->doEdit(
+   $link['url'],
+   wfMessage( 'linkfilter-edit-summary' 
)->inContentLanguage()->text()
+   );
+   $newPageID = $page->getID();
 
// Tie link record to wiki page
$dbw = wfGetDB( DB_MASTER );
@@ -140,7 +143,7 @@
$dbw->update(
'link',
/* SET */array(
-   'link_page_id' => intval( $newPageId ),
+   'link_page_id' => intval( $newPageID ),
'link_approved_date' => $date
),
/* WHERE */array( 'link_id' => intval( $id ) ),

-- 
To view, visit https://gerrit.wikimedia.org/r/329795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0d2e01724efa65af2f00b82a058974a98316724
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: MtDu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't block VE/NWE from loading if 'editintro' is specified

2016-12-31 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329794 )

Change subject: Don't block VE/NWE from loading if 'editintro' is specified
..

Don't block VE/NWE from loading if 'editintro' is specified

Later we should actually show the edit intro, but that is a
separate issue (T56029).

Bug: T153481
Change-Id: I97622a3d86b975866305aaa745bac51f6b55f217
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/94/329794/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 332bcc2..153fd1c 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -152,7 +152,6 @@
// TODO: Other params too? See identical list in 
ve.init.mw.DesktopArticleTarget.init.js
isset( $params['undo'] ) ||
isset( $params['undoafter'] ) ||
-   isset( $params['editintro'] ) ||
isset( $params['preload'] ) ||
isset( $params['preloadtitle'] ) ||
isset( $params['preloadparams'] ) ||
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 7c8b6d0..6bb2ae8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -842,7 +842,6 @@
if (
uri.query.undo === undefined &&
uri.query.undoafter === undefined &&
-   uri.query.editintro === undefined &&
uri.query.preload === undefined &&
uri.query.preloadtitle === undefined &&
uri.query.preloadparams === undefined &&

-- 
To view, visit https://gerrit.wikimedia.org/r/329794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97622a3d86b975866305aaa745bac51f6b55f217
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace deprecated mediawiki.UI Less variables with current ...

2016-12-31 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329793 )

Change subject: Replace deprecated mediawiki.UI Less variables with current ones
..

Replace deprecated mediawiki.UI Less variables with current ones

Replacing mediawiki.UI Less variables, which were deprecated since
MW 1.24 with current ones. This is an intermediate step necessary
to proceed in preparation of new WMUI Base variables.
Also removing unnecessary custom login screen input border colors
and exchange leftover constructive submit button with progressive
background-color.

Bug: T154362
Change-Id: I3e2e1438a92c77d9f7e3b914fcb2381073534a0a
---
M resources/mobile.editor.ve/VisualEditorOverlay.less
M resources/mobile.overlays/Overlay.less
M resources/skins.minerva.special.userlogin.styles/userlogin.less
3 files changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/93/329793/1

diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less 
b/resources/mobile.editor.ve/VisualEditorOverlay.less
index 9b69745..19e54d7 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.less
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.less
@@ -86,7 +86,7 @@
 
.ve-init-mw-mobileArticleTarget-toolbar {
@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
-   border: 1px solid @colorGrayLighter;
+   border: 1px solid @colorGray13;
border-width: 0 1px;
}
// Everything is measured in ems so the easiest way to 
scale
diff --git a/resources/mobile.overlays/Overlay.less 
b/resources/mobile.overlays/Overlay.less
index ea243fb..a1b1ee6 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -233,13 +233,13 @@
}
 
.continue {
-   color: #fff;
background-color: @colorProgressive;
+   color: #fff;
}
 
.submit {
+   background-color: @colorProgressive;
color: #fff;
-   background-color: @colorConstructive;
}
 
h2 {
diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less 
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 5f84221..0d4520d 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -171,8 +171,6 @@
 
// Make the inputs look connected in mobile mode
.mw-ui-input {
-   border: solid 1px @colorGrayLight;
-

[MediaWiki-commits] [Gerrit] mediawiki...SemanticImageAnnotator[master]: Replaced deprecated "Article::doEdit("

2016-12-31 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329792 )

Change subject: Replaced deprecated "Article::doEdit("
..

Replaced deprecated "Article::doEdit("

Bug: T151973
Change-Id: I8873109e192e9786ec6a5100ff836617a0537efe
---
M SIA_AjaxFunctions.php
1 file changed, 10 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticImageAnnotator 
refs/changes/92/329792/1

diff --git a/SIA_AjaxFunctions.php b/SIA_AjaxFunctions.php
index 9a0dca7..3c96e79 100644
--- a/SIA_AjaxFunctions.php
+++ b/SIA_AjaxFunctions.php
@@ -10,8 +10,8 @@
$article->doDelete('ImageAnnotation removed');
return($annotationID);
 }
-   
-function writeAnnotationProperties($newPageName, $annotatedImage, $imageURL, 
$coords,$createdBy){
+
+function writeAnnotationProperties($newPageName, $annotatedImage, $imageURL, 
$coords, $createdBy){
$newTitle = Title::newFromText($newPageName);
$newArticle = new Article($newTitle);
$content = '';
@@ -21,7 +21,8 @@
$content .= '[[SIArectangleCoordinates::'.$coords.'| ]]'."\n";
$content .= '[[SIAcreatedBy::'.$createdBy.'| ]]'."\n";
$content .= '[[Category:ImageAnnotation]]'."\n";
-   $newArticle->doEdit($content, 'Created by Semantic Image Annotator');
+   $contentObject = ContentHandler::makeContent( $content, $newTitle );
+   $newArticle->doEditContent($contentObject, 'Created by Semantic Image 
Annotator');
return ('success');
 }
 
@@ -35,7 +36,7 @@
 $new = version_compare($vers, '1.7', '>=');
 }
 }
-
+
 $returnString = '{"shapes":[';
 $queryString = '[[SIAannotatedImage::'.$annotatedImage.']]';
 $params = array();
@@ -43,7 +44,7 @@
 $params['mainlabel'] = 'result';
 #$params = ['order'];
 #$params = ['sort'];
-
+
if($new){
 $params['order'] = array('asc');
 $params['sort'] = array('SIAannotatedImage');
@@ -52,7 +53,7 @@
 $params['order'] = 'asc';
 $params['sort'] = 'SIAannotatedImage';
 }
-
+
//Generate all the extra printouts, eg all properties to retrieve:
$printmode = SMWPrintRequest::PRINT_PROP;
$customPrintouts = array(   'coordinates'   => 
'SIArectangleCoordinates',
@@ -69,17 +70,17 @@
$query  = SMWQueryProcessor::createQuery( $queryString, $params, 
$context, $format, $extraprintouts );
$store = smwfGetStore(); // default store
$res = $store->getQueryResult( $query );
-   
+
$shapeCounter = 0;
while( ($resArrayArray = $res->getNext()) != false){//Array of 
SMWResultArray Objects, eg. all retrieved Pages
$shapeCounter++;
 
if($shapeCounter > 1) $returnString.=',';
$returnString.='{';
-   foreach($resArrayArray as $resArray){   
//SMWResultArray-Object, column of resulttable (pagename or propertyvalue)  

+   foreach($resArrayArray as $resArray){   
//SMWResultArray-Object, column of resulttable (pagename or propertyvalue)
$currentPrintRequestLabel = 
$resArray->getPrintRequest()->getLabel();   //The label as defined in the above 
array
if($currentPrintRequestLabel == 'coordinates'){
-   $currentResultPage = 
$resArray->getResultSubject(); 
+   $currentResultPage = 
$resArray->getResultSubject();
$currentID = 
$currentResultPage->getTitle()->getFullText();
$currentCoords = 
$resArray->getNextDataItem()->getSerialization();

$returnString.='"coords":"'.$currentCoords.'","id":"'.$currentID.'"';

-- 
To view, visit https://gerrit.wikimedia.org/r/329792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8873109e192e9786ec6a5100ff836617a0537efe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticImageAnnotator
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SemanticComments[master]: Replaced deprecated "Article::doEdit("

2016-12-31 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329791 )

Change subject: Replaced deprecated "Article::doEdit("
..

Replaced deprecated "Article::doEdit("

Plus fixed indention

Bug: T151973
Change-Id: I8b24efa629379fa89b135dafd550d427be429939
---
M specials/Comment/CE_Comment.php
1 file changed, 113 insertions(+), 112 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticComments 
refs/changes/91/329791/1

diff --git a/specials/Comment/CE_Comment.php b/specials/Comment/CE_Comment.php
index f7044eb..9e4bf0c 100644
--- a/specials/Comment/CE_Comment.php
+++ b/specials/Comment/CE_Comment.php
@@ -1,36 +1,36 @@
 http://www.gnu.org/licenses/>.
- *
- */
+* Copyright (C) Vulcan Inc.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with this program.If not, see .
+*
+*/
 
 /**
- * @file
- * @ingroup CEComment
- * 
- * This file contains the implementation of comment creation for 
SemanticComments.
- *
- * @author Benjamin Langguth
- * Date: 07.12.2009
- */
+* @file
+* @ingroup CEComment
+*
+* This file contains the implementation of comment creation for 
SemanticComments.
+*
+* @author Benjamin Langguth
+* Date: 07.12.2009
+*/
 
 /**
- * @defgroup CEComment
- * @ingroup SemanticComments
- */
+* @defgroup CEComment
+* @ingroup SemanticComments
+*/
 
 if ( !defined( 'MEDIAWIKI' ) ) {
die( "This file is part of the SemanticComments extension. It is not a 
valid entry point.\n" );
@@ -38,18 +38,18 @@
 
 
 class CEComment {
-   
+
/* constants */
const SUCCESS = 0;
const COMMENT_ALREADY_EXISTS = 1;
const PERMISSION_ERROR = 2;
-   
+
/**
-* This function creates a new comment article
-* @param string $pageName
-* @param string $pageContent
-* @param bool $editMode
-*/
+   * This function creates a new comment article
+   * @param string $pageName
+   * @param string $pageContent
+   * @param bool $editMode
+   */
public static function createComment( $pageName, $pageContent, 
$editMode = false ) {
wfProfileIn( __METHOD__ . ' [SemanticComments]' );
global $wgUser, $cegEnableComment, $cegEnableCommentFor;
@@ -59,7 +59,7 @@
$title = Title::makeTitle( CE_COMMENT_NS, $title );
}
$article = new Article( $title );
-   
+
# check if comments are enabled #
if ( !isset( $cegEnableComment ) || !$cegEnableComment ) {
wfProfileOut( __METHOD__ . ' [SemanticComments]' );
@@ -70,92 +70,93 @@
}
# check authorization #
if ( !isset( $cegEnableCommentFor )
-   || ( $cegEnableCommentFor == CE_COMMENT_NOBODY )
-   || ( ( $cegEnableCommentFor == CE_COMMENT_AUTH_ONLY ) 
&& $wgUser->isAnon() ) )
+   || ( $cegEnableCommentFor == CE_COMMENT_NOBODY )
+   || ( ( $cegEnableCommentFor == CE_COMMENT_AUTH_ONLY ) && 
$wgUser->isAnon() ) )
{
wfProfileOut( __METHOD__ . ' [SemanticComments]' );
return CECommentUtils::createXMLResponse(
wfMessage( 'ce_cf_disabled' )->text(),
self::PERMISSION_ERROR, $pageName );
-   } else {
-   //user is allowed
-   if ( $article->exists() && !$editMode ) {
-   wfProfileOut( __METHOD__ . ' 
[SemanticComments]' );
-   return CECommentUtils::createXMLResponse(
-   wfMessage( 'ce_comment_exists', 
$pageName )->text(),
-   self::COMMENT_ALREADY_EXISTS, $pageName
-   );
-   }
-   // Insert current Date
-   $date = new DateTime();
-   $dateString = $date->format( 'c' );
-   if ( $editMode ) {
-try{
-   // use the original DATE!!!
-   $comNS = MWNamespace::getCanonicalName( 
CE_COMMENT_NS );
-   $qandp =

[MediaWiki-commits] [Gerrit] mediawiki...PageSchemas[master]: Removed deprecated "Article::doEdit("

2016-12-31 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329790 )

Change subject: Removed deprecated "Article::doEdit("
..

Removed deprecated "Article::doEdit("

Bug: T151973
Change-Id: Ib3e2cb5def631ff13e0ff337ee990cfaca840379
---
M PS_CreatePageJob.php
1 file changed, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageSchemas 
refs/changes/90/329790/1

diff --git a/PS_CreatePageJob.php b/PS_CreatePageJob.php
index 713810d..05bdaec 100644
--- a/PS_CreatePageJob.php
+++ b/PS_CreatePageJob.php
@@ -49,16 +49,11 @@
$actual_user = $wgUser;
$wgUser = User::newFromId( $this->params['user_id'] );
$edit_summary = wfMessage( 'ps-generatepages-editsummary' 
)->inContentLanguage()->parse();
-   if ( method_exists( 'WikiPage', 'getContent' ) ) {
-   // MW >= 1.21
-   $content = new WikitextContent( $page_text );
-   $wikiPage->doEditContent( $content, $edit_summary );
-   } else {
-   $article->doEdit( $page_text, $edit_summary );
-   }
+   $content = new WikitextContent( $page_text );
+   $wikiPage->doEditContent( $content, $edit_summary );
+
$wgUser = $actual_user;
wfProfileOut( __METHOD__ );
return true;
}
 }
-

-- 
To view, visit https://gerrit.wikimedia.org/r/329790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e2cb5def631ff13e0ff337ee990cfaca840379
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageSchemas
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329778 )

Change subject: Remove deprecated usages of ImageGallery
..


Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I90a5beb7c7e7ac8889e5f226c5a3bb17a416ba14
---
M SpecialUpload.1.21.3.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SpecialUpload.1.21.3.php b/SpecialUpload.1.21.3.php
index 2a3ff91..dbfa051 100644
--- a/SpecialUpload.1.21.3.php
+++ b/SpecialUpload.1.21.3.php
@@ -826,7 +826,7 @@
return '';
}
 
-   $gallery = new ImageGallery;
+   $gallery = ImageGalleryBase::factory();
$gallery->setShowBytes( false );
foreach ( $dupes as $file ) {
$gallery->add( $file->getTitle() );

-- 
To view, visit https://gerrit.wikimedia.org/r/329778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I90a5beb7c7e7ac8889e5f226c5a3bb17a416ba14
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultiUpload
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...OfflineImportLexicon[master]: Replaced deprecated "Article::doEdit("

2016-12-31 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329789 )

Change subject: Replaced deprecated "Article::doEdit("
..

Replaced deprecated "Article::doEdit("

Bug: T151973
Change-Id: I61736a07763a262b5a87aef887b09d9d1d7a826a
---
M OfflineImportLexicon_body.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OfflineImportLexicon 
refs/changes/89/329789/1

diff --git a/OfflineImportLexicon_body.php b/OfflineImportLexicon_body.php
index 65459d9..153396b 100644
--- a/OfflineImportLexicon_body.php
+++ b/OfflineImportLexicon_body.php
@@ -326,7 +326,8 @@
 
$article = new Article($titleObj);
$flags = $flags|EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY;
-   $status = $article->doEdit( $content, $summary, 
$flags,false,$wgUser);
+   $articleContent = ContentHandler::makeContent( $content, 
$titleObj );
+   $status = $article->doEditContent( $articleContent, $summary, 
$flags,false,$wgUser);
$result = true;
if ( !$status->isOK() ) {
$result = $status->getErrorsArray();

-- 
To view, visit https://gerrit.wikimedia.org/r/329789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61736a07763a262b5a87aef887b09d9d1d7a826a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OfflineImportLexicon
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329788 )

Change subject: Replace deprecated Article::doEdit()
..

Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: Iba294e14ba00c836fe5451654a7a3e15028a6c8e
---
M FanBoxClass.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes 
refs/changes/88/329788/1

diff --git a/FanBoxClass.php b/FanBoxClass.php
index c03c898..215ffe5 100644
--- a/FanBoxClass.php
+++ b/FanBoxClass.php
@@ -88,9 +88,9 @@
trim( $category ) . "]]\n";
}
}
-   $article = new Article( $this->title );
+   $page = WikiPage::factory( $this->title );
 
-   $article_content = $this->buildWikiText() . "\n\n" .
+   $pageContent = $this->buildWikiText() . "\n\n" .
$this->getBaseCategories() . "\n" . $categories_wiki .
"\n__NOEDITSECTION__";
 
@@ -100,7 +100,7 @@
$descTitle->purgeSquid();
} else {
// New fantag; create the description page.
-   $article->doEdit( $this->buildWikiText() . "\n\n" . 
$article_content, $desc );
+   $page->doEditContent( $this->buildWikiText() . "\n\n" . 
$pageContent, $desc );
}
 
# Test to see if the row exists using INSERT IGNORE
@@ -215,13 +215,13 @@
':' . trim( $category ) . "]]\n";
}
}
-   $article = new Article( $this->title );
+   $page = WikiPage::factory( $this->title );
 
-   $article_content = $this->buildWikiText() . "\n" .
+   $pageContent = $this->buildWikiText() . "\n" .
$this->getBaseCategories() . "\n" . $categories_wiki .
"\n__NOEDITSECTION__";
 
-   $article->doEdit( $article_content, wfMessage( 
'fanbox-summary-update' )->inContentLanguage()->parse() );
+   $page->doEditContent( $pageContent, wfMessage( 
'fanbox-summary-update' )->inContentLanguage()->parse() );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/329788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba294e14ba00c836fe5451654a7a3e15028a6c8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: MtDu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Replaced deprecated Article::doEdit(

2016-12-31 Thread Filip (Code Review)

Filip has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329787 )

Change subject: Replaced deprecated Article::doEdit(
..

Replaced deprecated Article::doEdit(

Bug: T151973
Change-Id: Iaa729e81397bacd900ad389d439bfbaf60dabeb8
---
M import/import-parsed-discussions.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads 
refs/changes/87/329787/1

diff --git a/import/import-parsed-discussions.php 
b/import/import-parsed-discussions.php
index 3011668..c670007 100644
--- a/import/import-parsed-discussions.php
+++ b/import/import-parsed-discussions.php
@@ -79,7 +79,7 @@
 
$root = new Article( $title, 0 );
 
-   $root->doEdit(
+   $root->doEditContent(
ContentHandler::makeContent( $info['content'], $title ),
'Imported from JSON',
EDIT_NEW,

-- 
To view, visit https://gerrit.wikimedia.org/r/329787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa729e81397bacd900ad389d439bfbaf60dabeb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert NTP disabling for leap second

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329785 )

Change subject: Revert NTP disabling for leap second
..

Revert NTP disabling for leap second

Revert all commits that disabled NTP across the fleet for leap second

This reverts commit 82079564388f3ae039d8de7ee66b17a8a134268f.
This reverts commit 74ec817bb1e8ea5d7ecee5014e6a1205234c9cd7.
This reverts commit de0769badc3f08ef01fa6d3e62bcb734b801069b.

Change-Id: I187220a293e816d1363b3828ba6e0b388e882d2f
---
D hieradata/codfw/ntp/daemon.yaml
D hieradata/eqiad/ntp/daemon.yaml
D hieradata/esams/ntp/daemon.yaml
D hieradata/hosts/acamar.yaml
M hieradata/hosts/achernar.yaml
D hieradata/hosts/chromium.yaml
D hieradata/hosts/hydrogen.yaml
D hieradata/hosts/maerlant.yaml
D hieradata/hosts/nescio.yaml
D hieradata/ulsfo/ntp/daemon.yaml
M modules/standard/manifests/ntp/client.pp
11 files changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/329785/1

diff --git a/hieradata/codfw/ntp/daemon.yaml b/hieradata/codfw/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/codfw/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/eqiad/ntp/daemon.yaml b/hieradata/eqiad/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/eqiad/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/esams/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/acamar.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/achernar.yaml b/hieradata/hosts/achernar.yaml
index 40085f2..75e02b8 100644
--- a/hieradata/hosts/achernar.yaml
+++ b/hieradata/hosts/achernar.yaml
@@ -1,4 +1,3 @@
 debdeploy::grains:
   debdeploy-dnsrecursor:
 value: canary
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/chromium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/hydrogen.yaml b/hieradata/hosts/hydrogen.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/hydrogen.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/maerlant.yaml b/hieradata/hosts/maerlant.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/maerlant.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/hosts/nescio.yaml b/hieradata/hosts/nescio.yaml
deleted file mode 100644
index 292da5c..000
--- a/hieradata/hosts/nescio.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: present
diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml
deleted file mode 100644
index c3e3687..000
--- a/hieradata/ulsfo/ntp/daemon.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ntp::daemon::ensure: absent
diff --git a/modules/standard/manifests/ntp/client.pp 
b/modules/standard/manifests/ntp/client.pp
index c30ed95..134a9a4 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -20,7 +20,6 @@
 }
 
 monitoring::service { 'ntp':
-ensure => absent,
 description=> 'NTP',
 check_command  => 'check_ntp_time!0.5!1',
 check_interval => 30,

-- 
To view, visit https://gerrit.wikimedia.org/r/329785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I187220a293e816d1363b3828ba6e0b388e882d2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...DynamicPageList[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329786 )

Change subject: Replace deprecated Article::doEdit()
..

Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: If84b4c43bc69f12b9cb345558c611d4ebff795b3
---
M DPL.php
M DPLSetup.php
2 files changed, 14 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DynamicPageList 
refs/changes/86/329786/1

diff --git a/DPL.php b/DPL.php
index ff1b352..1b9357b 100644
--- a/DPL.php
+++ b/DPL.php
@@ -1068,9 +1068,14 @@
$titleX = Title::newFromText( $title );
$permissionErrors = $titleX->getUserPermissionsErrors( 'edit', 
$wgUser );
if ( count( $permissionErrors ) == 0 ) {
-   $articleX = new Article( $titleX );
-   $articleX->doEdit( $text, $summary, EDIT_UPDATE | 
EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY );
-   $wgOut->redirect( $titleX->getFullURL( 
$articleX->isRedirect() ? 'redirect=no' : '' ) );
+   $pageX = WikiPage::factory( $titleX );
+   $pageXContent = ContentHandler::makeContent( $text, 
$pageX->getTitle() );
+   $pageX->doEditContent(
+   $pageXContent,
+   $summary,
+   EDIT_UPDATE | EDIT_DEFER_UPDATES | 
EDIT_AUTOSUMMARY
+   );
+   $wgOut->redirect( $titleX->getFullURL( 
$pageX->isRedirect() ? 'redirect=no' : '' ) );
return '';
} else {
$wgOut->showPermissionsErrorPage( $permissionErrors );
diff --git a/DPLSetup.php b/DPLSetup.php
index 8bbe0a1..e7c6cf7 100644
--- a/DPLSetup.php
+++ b/DPLSetup.php
@@ -1232,11 +1232,15 @@
$title = Title::newFromText( 'Template:Extension DPL' );
global $wgUser;
if ( !$title->exists() && $wgUser->isAllowed( 'edit' ) 
) {
-   $article = new Article( $title );
-   $article->doEdit(
+   $page = WikiPage::factory( $title );
+   $pageContent = ContentHandler::makeContent(
"This page was automatically 
created. It serves as an anchor page for " .
"all 
'''[[Special:WhatLinksHere/Template:Extension_DPL|invocations]]''' " .
"of 
[http://mediawiki.org/wiki/Extension:DynamicPageList Extension:DynamicPageList 
(DPL)].",
+   $page->getTitle()
+   );
+   $page->doEdit(
+   $pageContent
$title,
EDIT_NEW | EDIT_FORCE_BOT
);

-- 
To view, visit https://gerrit.wikimedia.org/r/329786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If84b4c43bc69f12b9cb345558c611d4ebff795b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DynamicPageList
Gerrit-Branch: master
Gerrit-Owner: MtDu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nescio and maerlant are NTP servers too

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329784 )

Change subject: nescio and maerlant are NTP servers too
..


nescio and maerlant are NTP servers too

So don't disable ntpd on them

Change-Id: Iadc6b45f13b9f7761bfd11dbb5d3984557f09bc5
---
A hieradata/hosts/maerlant.yaml
A hieradata/hosts/nescio.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/maerlant.yaml b/hieradata/hosts/maerlant.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/maerlant.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/nescio.yaml b/hieradata/hosts/nescio.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/nescio.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present

-- 
To view, visit https://gerrit.wikimedia.org/r/329784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadc6b45f13b9f7761bfd11dbb5d3984557f09bc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nescio and maerlant are NTP servers too

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329784 )

Change subject: nescio and maerlant are NTP servers too
..

nescio and maerlant are NTP servers too

So don't disable ntpd on them

Change-Id: Iadc6b45f13b9f7761bfd11dbb5d3984557f09bc5
---
A hieradata/hosts/maerlant.yaml
A hieradata/hosts/nescio.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/329784/1

diff --git a/hieradata/hosts/maerlant.yaml b/hieradata/hosts/maerlant.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/maerlant.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/nescio.yaml b/hieradata/hosts/nescio.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/nescio.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present

-- 
To view, visit https://gerrit.wikimedia.org/r/329784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadc6b45f13b9f7761bfd11dbb5d3984557f09bc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace deprecated Article::doEdit()

2016-12-31 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329783 )

Change subject: Replace deprecated Article::doEdit()
..

Replace deprecated Article::doEdit()

Article::doEdit() has been deprecated since MW 1.21. This patch replaces the 
"Article" class with "WikiPage" and "doEdit" with "doEditContent".

Bug: T151973
Change-Id: I0e7b6006e6ce7d8a372e2ca09f31a87e1f8c75db
---
M SpecialCreateBlogPost.php
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage 
refs/changes/83/329783/1

diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index d179011..7f53905 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -101,8 +101,8 @@
$today = $wgContLang->date( wfTimestampNow() );
 
// Create the blog page if it doesn't already exist
-   $article = new Article( $title, 0 );
-   if ( $article->exists() ) {
+   $page = WikiPage::factory( $title );
+   if ( $page->exists() ) {
$out->setPageTitle( $this->msg( 
'errorpagetitle' ) );
$out->addWikiMsg( 
'blog-create-error-page-exists' );
$out->addReturnTo( $this->getPageTitle() );
@@ -139,7 +139,7 @@
$wikitextCategories = implode( "\n", 
$categories );
 
// Perform the edit
-   $article->doEdit(
+   $pageContent = ContentHandler::makeContent(
// Instead of , Wikia had 
Template:Blog Top over
// here and Template:Blog Bottom at the 
bottom, where we
// have the comments tag right now
@@ -147,10 +147,14 @@
$request->getVal( 'pageBody' ) 
. "\n\n" .
'' . "\n\n" . 
$wikitextCategories .
"\n__NOEDITSECTION__",
+   $page->getTitle()
+   );
+   $page->doEditContent(
+   $pageContent,
$this->msg( 'blog-create-summary' 
)->inContentLanguage()->text()
);
 
-   $articleId = $article->getID();
+   $pageID = $page->getID();
// Add a vote for the page
// This was originally in its own global 
function,
// wfFinishCreateBlog and after that in the 
BlogHooks class but
@@ -160,7 +164,7 @@
// Using OutputPageBeforeHTML hook, which, 
according to its
// manual page, runs on *every* page view was 
such a stupid
// idea IMHO.
-   $vote = new Vote( $articleId );
+   $vote = new Vote( $pageID );
$vote->insert( 1 );
 
$stats = new UserStatsTrack( $user->getID(), 
$user->getName() );

-- 
To view, visit https://gerrit.wikimedia.org/r/329783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e7b6006e6ce7d8a372e2ca09f31a87e1f8c75db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: MtDu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SmoothGallery[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329779 )

Change subject: Remove deprecated usages of ImageGallery
..


Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I063a211ba8860cfdf80672095afe6933ec1aab7f
---
M SmoothGalleryClass.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SmoothGalleryClass.php b/SmoothGalleryClass.php
index 939ae42..4bc3df5 100644
--- a/SmoothGalleryClass.php
+++ b/SmoothGalleryClass.php
@@ -185,7 +185,7 @@
// Wrapper div for plain old gallery, to be shown per default, 
if JS is off.
$output = '';
 
-   $plain_gallery = new ImageGallery();
+   $plain_gallery = ImageGalleryBase::factory();
 
$i = 0;
foreach ( $galleryArray["images"] as $image ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/329779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I063a211ba8860cfdf80672095afe6933ec1aab7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmoothGallery
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329781 )

Change subject: Remove deprecated usages of ImageGallery
..


Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I8d30486c550ac436057d04fa6a6832aee9d4fc9a
---
M VideoPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/VideoPage.php b/VideoPage.php
index e588755..dfe4d47 100644
--- a/VideoPage.php
+++ b/VideoPage.php
@@ -294,7 +294,7 @@
$this->children = array();
$this->children_start_char = array();
if ( $this->showGallery ) {
-   $this->gallery = new ImageGallery();
+   $this->gallery = ImageGalleryBase::factory();
}
#if ( $this->showVideoGallery ) {
$this->videogallery = new VideoGallery();

-- 
To view, visit https://gerrit.wikimedia.org/r/329781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d30486c550ac436057d04fa6a6832aee9d4fc9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix wrong class name for ImageGalleryBase in comments

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329776 )

Change subject: Fix wrong class name for ImageGalleryBase in comments
..


Fix wrong class name for ImageGalleryBase in comments

This change is part of change 329773.

Change-Id: I2766e2ff3e64a84f52a5d7fa065bbc38280866c1
---
M includes/CategoryViewer.php
M includes/specials/pagers/NewFilesPager.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 4c4b8bb..facf847 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -67,7 +67,7 @@
/** @var Collation */
public $collation;
 
-   /** @var ImageGallery */
+   /** @var ImageGalleryBase */
public $gallery;
 
/** @var Category Category object for this page. */
diff --git a/includes/specials/pagers/NewFilesPager.php 
b/includes/specials/pagers/NewFilesPager.php
index 9f6c58c..e22b939 100644
--- a/includes/specials/pagers/NewFilesPager.php
+++ b/includes/specials/pagers/NewFilesPager.php
@@ -27,7 +27,7 @@
 class NewFilesPager extends ReverseChronologicalPager {
 
/**
-* @var ImageGallery
+* @var ImageGalleryBase
 */
protected $gallery;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2766e2ff3e64a84f52a5d7fa065bbc38280866c1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable NTP checks during the leap second

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329782 )

Change subject: Disable NTP checks during the leap second
..


Disable NTP checks during the leap second

This is a followup for 8207956, disabling monitoring for NTP, while we
got ntpd disabled across the fleet.

Change-Id: Ia20eccf5abe28505ee37f0d3ea863bb2f0218d88
---
M modules/standard/manifests/ntp/client.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/standard/manifests/ntp/client.pp 
b/modules/standard/manifests/ntp/client.pp
index 134a9a4..c30ed95 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -20,6 +20,7 @@
 }
 
 monitoring::service { 'ntp':
+ensure => absent,
 description=> 'NTP',
 check_command  => 'check_ntp_time!0.5!1',
 check_interval => 30,

-- 
To view, visit https://gerrit.wikimedia.org/r/329782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia20eccf5abe28505ee37f0d3ea863bb2f0218d88
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable NTP checks during the leap second

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329782 )

Change subject: Disable NTP checks during the leap second
..

Disable NTP checks during the leap second

This is a followup for 8207956, disabling monitoring for NTP, while we
got ntpd disabled across the fleet.

Change-Id: Ia20eccf5abe28505ee37f0d3ea863bb2f0218d88
---
M modules/standard/manifests/ntp/client.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/329782/1

diff --git a/modules/standard/manifests/ntp/client.pp 
b/modules/standard/manifests/ntp/client.pp
index 134a9a4..c30ed95 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -20,6 +20,7 @@
 }
 
 monitoring::service { 'ntp':
+ensure => absent,
 description=> 'NTP',
 check_command  => 'check_ntp_time!0.5!1',
 check_interval => 30,

-- 
To view, visit https://gerrit.wikimedia.org/r/329782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia20eccf5abe28505ee37f0d3ea863bb2f0218d88
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable ntp across the fleet for leap second

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329780 )

Change subject: Disable ntp across the fleet for leap second
..


Disable ntp across the fleet for leap second

Just as a safeguard, disable NTP. This is probably not really warranted
by after discussions, ops decided to play it safe and disable NTP across
the fleet. Notable exceptions are the NTP servers themselves

This is already late (NTP flag is issue 20 hours ahead of the
actual change at 04:00 UTC) but we are sticking to the plan.

Change-Id: If7831797fb28ddf64033726a799389d2ce642b17
---
A hieradata/codfw/ntp/daemon.yaml
A hieradata/eqiad/ntp/daemon.yaml
A hieradata/esams/ntp/daemon.yaml
A hieradata/hosts/acamar.yaml
M hieradata/hosts/achernar.yaml
A hieradata/hosts/chromium.yaml
A hieradata/hosts/hydrogen.yaml
A hieradata/ulsfo/ntp/daemon.yaml
8 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/codfw/ntp/daemon.yaml b/hieradata/codfw/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/codfw/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/eqiad/ntp/daemon.yaml b/hieradata/eqiad/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/eqiad/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/esams/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/acamar.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/achernar.yaml b/hieradata/hosts/achernar.yaml
index 75e02b8..40085f2 100644
--- a/hieradata/hosts/achernar.yaml
+++ b/hieradata/hosts/achernar.yaml
@@ -1,3 +1,4 @@
 debdeploy::grains:
   debdeploy-dnsrecursor:
 value: canary
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/chromium.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/hydrogen.yaml b/hieradata/hosts/hydrogen.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/hydrogen.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/ulsfo/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent

-- 
To view, visit https://gerrit.wikimedia.org/r/329780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If7831797fb28ddf64033726a799389d2ce642b17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...intersection[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329777 )

Change subject: Remove deprecated usages of ImageGallery
..


Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I9f9c01c1a253809d7270831674269df361366d35
---
M DynamicPageList.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/DynamicPageList.hooks.php b/DynamicPageList.hooks.php
index 85904b1..50e4788 100644
--- a/DynamicPageList.hooks.php
+++ b/DynamicPageList.hooks.php
@@ -142,7 +142,7 @@
switch ( $arg ) {
case 'gallery':
$useGallery = true;
-   $gallery = 
ImageGallery::factory();
+   $gallery = 
ImageGalleryBase::factory();
$gallery->setParser( 
$mwParser );
$startList = '';
$endList = '';

-- 
To view, visit https://gerrit.wikimedia.org/r/329777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f9c01c1a253809d7270831674269df361366d35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329781 )

Change subject: Remove deprecated usages of ImageGallery
..

Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I8d30486c550ac436057d04fa6a6832aee9d4fc9a
---
M VideoPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Video 
refs/changes/81/329781/1

diff --git a/VideoPage.php b/VideoPage.php
index e588755..dfe4d47 100644
--- a/VideoPage.php
+++ b/VideoPage.php
@@ -294,7 +294,7 @@
$this->children = array();
$this->children_start_char = array();
if ( $this->showGallery ) {
-   $this->gallery = new ImageGallery();
+   $this->gallery = ImageGalleryBase::factory();
}
#if ( $this->showVideoGallery ) {
$this->videogallery = new VideoGallery();

-- 
To view, visit https://gerrit.wikimedia.org/r/329781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d30486c550ac436057d04fa6a6832aee9d4fc9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable ntp across the fleet for leap second

2016-12-31 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329780 )

Change subject: Disable ntp across the fleet for leap second
..

Disable ntp across the fleet for leap second

Just as a safeguard, disable NTP. This is probably not really warranted
by after discussions, ops decided to play it safe and disable NTP across
the fleet. Notable exceptions are the NTP servers themselves

This is already late (NTP flag is issue 20 hours ahead of the
actual change at 04:00 UTC) but we are sticking to the plan.

Change-Id: If7831797fb28ddf64033726a799389d2ce642b17
---
A hieradata/codfw/ntp/daemon.yaml
A hieradata/eqiad/ntp/daemon.yaml
A hieradata/esams/ntp/daemon.yaml
A hieradata/hosts/acamar.yaml
M hieradata/hosts/achernar.yaml
A hieradata/hosts/chromium.yaml
A hieradata/hosts/hydrogen.yaml
A hieradata/ulsfo/ntp/daemon.yaml
8 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/329780/1

diff --git a/hieradata/codfw/ntp/daemon.yaml b/hieradata/codfw/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/codfw/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/eqiad/ntp/daemon.yaml b/hieradata/eqiad/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/eqiad/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/esams/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent
diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/acamar.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/achernar.yaml b/hieradata/hosts/achernar.yaml
index 75e02b8..40085f2 100644
--- a/hieradata/hosts/achernar.yaml
+++ b/hieradata/hosts/achernar.yaml
@@ -1,3 +1,4 @@
 debdeploy::grains:
   debdeploy-dnsrecursor:
 value: canary
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/chromium.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/hosts/hydrogen.yaml b/hieradata/hosts/hydrogen.yaml
new file mode 100644
index 000..292da5c
--- /dev/null
+++ b/hieradata/hosts/hydrogen.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: present
diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml
new file mode 100644
index 000..c3e3687
--- /dev/null
+++ b/hieradata/ulsfo/ntp/daemon.yaml
@@ -0,0 +1 @@
+ntp::daemon::ensure: absent

-- 
To view, visit https://gerrit.wikimedia.org/r/329780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7831797fb28ddf64033726a799389d2ce642b17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SmoothGallery[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329779 )

Change subject: Remove deprecated usages of ImageGallery
..

Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I063a211ba8860cfdf80672095afe6933ec1aab7f
---
M SmoothGalleryClass.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmoothGallery 
refs/changes/79/329779/1

diff --git a/SmoothGalleryClass.php b/SmoothGalleryClass.php
index 939ae42..4bc3df5 100644
--- a/SmoothGalleryClass.php
+++ b/SmoothGalleryClass.php
@@ -185,7 +185,7 @@
// Wrapper div for plain old gallery, to be shown per default, 
if JS is off.
$output = '';
 
-   $plain_gallery = new ImageGallery();
+   $plain_gallery = ImageGalleryBase::factory();
 
$i = 0;
foreach ( $galleryArray["images"] as $image ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/329779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I063a211ba8860cfdf80672095afe6933ec1aab7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SmoothGallery
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329778 )

Change subject: Remove deprecated usages of ImageGallery
..

Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I90a5beb7c7e7ac8889e5f226c5a3bb17a416ba14
---
M SpecialUpload.1.21.3.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiUpload 
refs/changes/78/329778/1

diff --git a/SpecialUpload.1.21.3.php b/SpecialUpload.1.21.3.php
index 2a3ff91..3bf6f0b 100644
--- a/SpecialUpload.1.21.3.php
+++ b/SpecialUpload.1.21.3.php
@@ -826,7 +826,7 @@
return '';
}
 
-   $gallery = new ImageGallery;
+   $gallery = new ImageGalleryBase::factory();
$gallery->setShowBytes( false );
foreach ( $dupes as $file ) {
$gallery->add( $file->getTitle() );

-- 
To view, visit https://gerrit.wikimedia.org/r/329778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90a5beb7c7e7ac8889e5f226c5a3bb17a416ba14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiUpload
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...intersection[master]: Remove deprecated usages of ImageGallery

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329777 )

Change subject: Remove deprecated usages of ImageGallery
..

Remove deprecated usages of ImageGallery

This change is part of change 329773.

Change-Id: I9f9c01c1a253809d7270831674269df361366d35
---
M DynamicPageList.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection 
refs/changes/77/329777/1

diff --git a/DynamicPageList.hooks.php b/DynamicPageList.hooks.php
index 85904b1..50e4788 100644
--- a/DynamicPageList.hooks.php
+++ b/DynamicPageList.hooks.php
@@ -142,7 +142,7 @@
switch ( $arg ) {
case 'gallery':
$useGallery = true;
-   $gallery = 
ImageGallery::factory();
+   $gallery = 
ImageGalleryBase::factory();
$gallery->setParser( 
$mwParser );
$startList = '';
$endList = '';

-- 
To view, visit https://gerrit.wikimedia.org/r/329777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f9c01c1a253809d7270831674269df361366d35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/intersection
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix wrong class names in comments

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329776 )

Change subject: Fix wrong class names in comments
..

Fix wrong class names in comments

Change-Id: I2766e2ff3e64a84f52a5d7fa065bbc38280866c1
---
M includes/CategoryViewer.php
M includes/specials/pagers/NewFilesPager.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/76/329776/1

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 4c4b8bb..facf847 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -67,7 +67,7 @@
/** @var Collation */
public $collation;
 
-   /** @var ImageGallery */
+   /** @var ImageGalleryBase */
public $gallery;
 
/** @var Category Category object for this page. */
diff --git a/includes/specials/pagers/NewFilesPager.php 
b/includes/specials/pagers/NewFilesPager.php
index 9f6c58c..e22b939 100644
--- a/includes/specials/pagers/NewFilesPager.php
+++ b/includes/specials/pagers/NewFilesPager.php
@@ -27,7 +27,7 @@
 class NewFilesPager extends ReverseChronologicalPager {
 
/**
-* @var ImageGallery
+* @var ImageGalleryBase
 */
protected $gallery;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2766e2ff3e64a84f52a5d7fa065bbc38280866c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_27]: Remove warning about missing site ID

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329775 )

Change subject: Remove warning about missing site ID
..

Remove warning about missing site ID

Seems to interfere with qunit somehow.

Cherry-picked from I1a52ce07943f20ccd63f5d357c5e006cd721da64 by @Tgr

Bug: T153729
Bug: T153597
Change-Id: I1a52ce07943f20ccd63f5d357c5e006cd721da64
(cherry picked from commit bf149be2f31fc7b7b2e472a8df8d28d8ea2b6093)
---
M extensions/Wikibase/client/includes/WikibaseClient.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/75/329775/1

diff --git a/extensions/Wikibase/client/includes/WikibaseClient.php 
b/extensions/Wikibase/client/includes/WikibaseClient.php
index 21a4573..559b66c 100644
--- a/extensions/Wikibase/client/includes/WikibaseClient.php
+++ b/extensions/Wikibase/client/includes/WikibaseClient.php
@@ -632,8 +632,6 @@
$site = $this->getSiteStore()->getSite( $siteId );
 
if ( !$site ) {
-   wfWarn( 'Cannot find site ' . $siteId . ' in 
sites table' );
-
return true;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a52ce07943f20ccd63f5d357c5e006cd721da64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_28]: Remove warning about missing site ID

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329774 )

Change subject: Remove warning about missing site ID
..

Remove warning about missing site ID

Seems to interfere with qunit somehow.

Cherry-picked from I1a52ce07943f20ccd63f5d357c5e006cd721da64 by @Tgr

Bug: T153729
Bug: T153597
Change-Id: I1a52ce07943f20ccd63f5d357c5e006cd721da64
(cherry picked from commit bf149be2f31fc7b7b2e472a8df8d28d8ea2b6093)
---
M extensions/Wikibase/client/includes/WikibaseClient.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/74/329774/1

diff --git a/extensions/Wikibase/client/includes/WikibaseClient.php 
b/extensions/Wikibase/client/includes/WikibaseClient.php
index cd95980..795673b 100644
--- a/extensions/Wikibase/client/includes/WikibaseClient.php
+++ b/extensions/Wikibase/client/includes/WikibaseClient.php
@@ -712,8 +712,6 @@
$site = $this->getSiteStore()->getSite( $siteId );
 
if ( !$site ) {
-   wfWarn( 'Cannot find site ' . $siteId . ' in 
sites table' );
-
return true;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a52ce07943f20ccd63f5d357c5e006cd721da64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecated class ImageGallery

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329773 )

Change subject: Removed deprecated class ImageGallery
..

Removed deprecated class ImageGallery

Bug: T61113
Change-Id: If315002ef7d1a3937f150d0dda930976c1d95f57
---
M RELEASE-NOTES-1.29
M includes/gallery/TraditionalImageGallery.php
2 files changed, 2 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/329773/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..c519c32 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,8 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* Class ImageGallery (deprecated in 1.22) was removed.
+  Use ImageGalleryBase::factory instead.
 
 == Compatibility ==
 
diff --git a/includes/gallery/TraditionalImageGallery.php 
b/includes/gallery/TraditionalImageGallery.php
index 0f889da..1fd7b0a 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -348,17 +348,3 @@
protected function adjustImageParameters( $thumb, &$imageParameters ) {
}
 }
-
-/**
- * Backwards compatibility. This always uses traditional mode
- * if called the old way, for extensions that may expect traditional
- * mode.
- *
- * @deprecated since 1.22 Use ImageGalleryBase::factory instead.
- */
-class ImageGallery extends TraditionalImageGallery {
-   function __construct( $mode = 'traditional' ) {
-   wfDeprecated( __METHOD__, '1.22' );
-   parent::__construct( $mode );
-   }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/329773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If315002ef7d1a3937f150d0dda930976c1d95f57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_27]: Use default wiki id in example settings.

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329771 )

Change subject: Use default wiki id in example settings.
..

Use default wiki id in example settings.

Until now, we force the local wiki ID to "mywiki" in the exampel settings.
This triggers a warning if "mywiki" is not known to the SiteLookup.

Instead of forcing a fixed value, we can just rely on the default for the
local site ID, which is the wiki's database name. That is consistent with
the conventions used on the WMF cluster.

Cherry picked from https://gerrit.wikimedia.org/r/#/c/329765/1

Bug: T153729
Change-Id: I01966cfb24a0700541a1d93c6f1ce5fd639b8c10
---
M extensions/Wikibase/client/config/WikibaseClient.example.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/71/329771/1

diff --git a/extensions/Wikibase/client/config/WikibaseClient.example.php 
b/extensions/Wikibase/client/config/WikibaseClient.example.php
index 922cc2b..d54a763 100644
--- a/extensions/Wikibase/client/config/WikibaseClient.example.php
+++ b/extensions/Wikibase/client/config/WikibaseClient.example.php
@@ -19,7 +19,8 @@
 }
 
 // The global site ID by which this wiki is known on the repo.
-$wgWBClientSettings['siteGlobalID'] = "mywiki";
+// Defaults to $wgDBname.
+// $wgWBClientSettings['siteGlobalID'] = "mywiki";
 
 $wgWBClientSettings['injectRecentChanges'] = true;
 $wgWBClientSettings['showExternalRecentChanges'] = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/329771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01966cfb24a0700541a1d93c6f1ce5fd639b8c10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[REL1_28]:

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329770 )

Change subject: 
..

Use default wiki id in example settings.

Until now, we force the local wiki ID to "mywiki" in the exampel settings.
This triggers a warning if "mywiki" is not known to the SiteLookup.

Instead of forcing a fixed value, we can just rely on the default for the
local site ID, which is the wiki's database name. That is consistent with
the conventions used on the WMF cluster.

Cherry picked from https://gerrit.wikimedia.org/r/#/c/329765/1

Bug: T153729
Change-Id: I01966cfb24a0700541a1d93c6f1ce5fd639b8c10
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/70/329770/1


-- 
To view, visit https://gerrit.wikimedia.org/r/329770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01966cfb24a0700541a1d93c6f1ce5fd639b8c10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replaced deprecated Linker::link() usages

2016-12-31 Thread Georggi199 (Code Review)

Georggi199 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329769 )

Change subject: Replaced deprecated Linker::link() usages
..

Replaced deprecated Linker::link() usages

Bug: T149346
Change-Id: Ic872dac40945eae635bd8c566f8a014244110e9a
---
M SystemGifts/SpecialViewSystemGifts.php
M SystemGifts/TopAwards.php
M UserActivity/UserActivity.body.php
M UserBoard/SpecialUserBoard.php
M UserGifts/SpecialGiveGift.php
M UserGifts/SpecialViewGifts.php
M UserProfile/UserProfileClass.php
M UserProfile/UserProfilePage.php
M UserRelationship/SpecialViewRelationships.php
M UserStats/TopFansByStat.php
M UserStats/TopFansRecent.php
M UserStats/TopUsers.php
12 files changed, 45 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/69/329769/1

diff --git a/SystemGifts/SpecialViewSystemGifts.php 
b/SystemGifts/SpecialViewSystemGifts.php
index 4714c4e..8ec1f41 100644
--- a/SystemGifts/SpecialViewSystemGifts.php
+++ b/SystemGifts/SpecialViewSystemGifts.php
@@ -23,6 +23,8 @@
public function execute( $par ) {
global $wgUploadPath;
 
+   $linkRenderer = $this->getLinkRenderer();
+
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -141,7 +143,7 @@
$output .= '';
 
if ( $page > 1 ) {
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$page_link,
$this->msg( 'ga-previous' )->plain(),
array(),
@@ -166,7 +168,7 @@
if ( $i == $page ) {
$output .= ( $i . ' ' );
} else {
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$page_link,
$i,
array(),
@@ -180,7 +182,7 @@
 
if ( ( $total - ( $per_page * $page ) ) > 0 ) {
$output .= $this->msg( 'word-separator' 
)->plain() .
-   Linker::link(
+   $linkRenderer->makeLink(
$page_link,
$this->msg( 'ga-next' 
)->plain(),
array(),
diff --git a/SystemGifts/TopAwards.php b/SystemGifts/TopAwards.php
index 2b39b78..5a18a4a 100644
--- a/SystemGifts/TopAwards.php
+++ b/SystemGifts/TopAwards.php
@@ -158,6 +158,7 @@
if ( $dbr->numRows( $res ) <= 0 ) {
$output .= $this->msg( 'topawards-empty' )->plain();
} else {
+   $linkRenderer = $this->getLinkRenderer();
foreach ( $res as $row ) {
$user_name = $row->sg_user_name;
$user_id = $row->sg_user_id;
@@ -181,7 +182,7 @@
$x++;
}
 
-   $userLink = Linker::link(
+   $userLink = $linkRenderer->makeLink(
Title::makeTitle( NS_USER, 
$row->sg_user_name ),
$user_name
);
diff --git a/UserActivity/UserActivity.body.php 
b/UserActivity/UserActivity.body.php
index f72f45e..8d5e1fb 100644
--- a/UserActivity/UserActivity.body.php
+++ b/UserActivity/UserActivity.body.php
@@ -129,7 +129,7 @@
}
}
 
-   $output .= Linker::link(
+   $output .= $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'useractivity-all' )->plain()
);
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index b230b4c..c2a7936 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -37,6 +37,8 @@
$request = $this->getRequest();
$currentUser = $this->getUser();
 
+   $linkRenderer = $this->getLinkRenderer();
+
// Set the page title, robot policies, etc.
$this->setHeaders();
 
@@ -170,7 +172,7 @@
if ( $numofpages > 1 ) {
$output .= '';
if ( $page > 1 ) {
-   $output .=

[MediaWiki-commits] [Gerrit] mediawiki...GWToolset[master]: Replaced deprecated Linker::link() usages

2016-12-31 Thread Georggi199 (Code Review)

Georggi199 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329768 )

Change subject: Replaced deprecated Linker::link() usages
..

Replaced deprecated Linker::link() usages

Bug: T149346
Change-Id: I4f7bb27ea12543e5ab67403bd89a754956894453
---
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Forms/PreviewForm.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Models/Mapping.php
M includes/Specials/SpecialGWToolset.php
7 files changed, 23 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset 
refs/changes/68/329768/1

diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php 
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 71e24dd..6b0bee9 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -15,7 +15,6 @@
 use GWToolset\Config;
 use GWToolset\GWTException;
 use GWToolset\Utils;
-use Linker;
 use Title;
 
 class MediawikiTemplatePhpAdapter implements DataAdapterInterface {
diff --git a/includes/Forms/MetadataDetectForm.php 
b/includes/Forms/MetadataDetectForm.php
index c2e8bc7..911a5c7 100644
--- a/includes/Forms/MetadataDetectForm.php
+++ b/includes/Forms/MetadataDetectForm.php
@@ -15,7 +15,7 @@
 use GWToolset\Utils;
 use GWToolset\Helpers\FileChecks;
 use GWToolset\Models\MediawikiTemplate;
-use Linker;
+use MediaWiki\MediaWikiServices;
 use SpecialPage;
 use Title;
 
@@ -72,6 +72,7 @@
$namespace = Utils::getNamespaceName( 
Config::$metadata_namespace );
$MediawikiTemplate = new MediawikiTemplate( new 
MediawikiTemplatePhpAdapter() );
$user = $SpecialPage->getUser();
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
 
return
Html::rawElement(
@@ -251,7 +252,7 @@
]
) .
Html::rawElement( 'br' ) .
-   Linker::link(
+   $linkRenderer->makeLink(
Title::newFromText(
'Special:PrefixIndex/' 
. $namespace . Config::$metadata_mapping_subpage
),
@@ -381,6 +382,7 @@
 
public static function getMetadataFileUrlInput( $namespace ) {
$result = null;
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
 
if ( Constants::USE_FILEBACKEND ) {
return $result;
@@ -403,7 +405,7 @@
]
) .
Html::rawElement( 'br' ) .
-   Linker::link(
+   $linkRenderer->makeLink(
Title::newFromText(
'Special:PrefixIndex/' .
$namespace .
diff --git a/includes/Forms/MetadataMappingForm.php 
b/includes/Forms/MetadataMappingForm.php
index bb0e36e..c522b4c 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -12,7 +12,7 @@
 use GWToolset\Config;
 use GWToolset\Utils;
 use GWToolset\Handlers\Forms\FormHandler;
-use Linker;
+use MediaWiki\MediaWikiServices;
 use Title;
 
 class MetadataMappingForm {
@@ -30,11 +30,12 @@
 */
public static function getForm( FormHandler $Handler, array 
&$user_options ) {
 
+   $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
$template_link = '[[Template:' .
Utils::sanitizeString( 
$user_options['gwtoolset-mediawiki-template-name'] ) .
']]';
$metadata_file_url = !empty( $user_options['Metadata-Title'] )
-   ? Linker::link( $user_options['Metadata-Title'], null, 
[ 'target' => '_blank' ] ) .
+   ? $linkRenderer->makeLink( 
$user_options['Metadata-Title'], null, [ 'target' => '_blank' ] ) .
Html::rawElement( 'br' )
: null;
 
@@ -650,7 +651,7 @@
)
) .
Html::rawElement( 'br' ) .
-   Linker::link(
+   $linkRenderer->makeLink(
Title::newFromText( 'Category:' . 
Config::$source_templates ),
null,

[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Replaced deprecated Linker::link() usages

2016-12-31 Thread Georggi199 (Code Review)

Georggi199 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329767 )

Change subject: Replaced deprecated Linker::link() usages
..

Replaced deprecated Linker::link() usages

Bug: T149346
Change-Id: Id5bef5db57e44a611a80d1114f36a53af362cd89
---
M backend/CodeCommentLinker.php
M ui/CodeCommentsListView.php
M ui/CodeRepoStatsView.php
M ui/CodeRevisionAuthorView.php
M ui/CodeRevisionListView.php
M ui/CodeRevisionView.php
M ui/CodeStatusChangeListView.php
M ui/CodeStatusListView.php
M ui/CodeView.php
9 files changed, 56 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview 
refs/changes/67/329767/1

diff --git a/backend/CodeCommentLinker.php b/backend/CodeCommentLinker.php
index 9f1cbae..b4f502e 100644
--- a/backend/CodeCommentLinker.php
+++ b/backend/CodeCommentLinker.php
@@ -101,7 +101,8 @@
 * @return  string
 */
function makeInternalLink( $title, $text ) {
-   return Linker::link( $title, $text );
+   $linkRenderer = 
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
+   return $linkRenderer->makeLink( $title, $text );
}
 }
 
diff --git a/ui/CodeCommentsListView.php b/ui/CodeCommentsListView.php
index 1515b1e..3c90810 100644
--- a/ui/CodeCommentsListView.php
+++ b/ui/CodeCommentsListView.php
@@ -60,16 +60,17 @@
}
 
function formatValue( $name, $value ) {
+   $linkRenderer = 
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
switch( $name ) {
case 'cc_rev_id':
-   return Linker::link(
+   return $linkRenderer->makeLink(
SpecialPage::getSafeTitleFor( 'Code', 
$this->mRepo->getName() . '/' . $value . '#code-comments' ),
-   htmlspecialchars( $value ) );
+   $value );
case 'cr_status':
-   return Linker::link(
+   return $linkRenderer->makeLink(
SpecialPage::getTitleFor( 'Code',
$this->mRepo->getName() . '/status/' . 
$value ),
-   htmlspecialchars( $this->mView->statusDesc( 
$value ) ) );
+   $this->mView->statusDesc( $value ) );
case 'cc_user_text':
return Linker::userLink( - 1, $value );
case 'cr_message':
diff --git a/ui/CodeRepoStatsView.php b/ui/CodeRepoStatsView.php
index 408b7fe..efeecaf 100644
--- a/ui/CodeRepoStatsView.php
+++ b/ui/CodeRepoStatsView.php
@@ -26,12 +26,13 @@
$wgOut->addHTML( ''
. '' . wfMessage( 'code-field-status' 
)->escaped() . ''
. wfMessage( 'code-stats-count' )->escaped() . 
'' );
+   $linkRenderer = 
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( CodeRevision::getPossibleStates() as $state ) 
{
$count = isset( $stats->states[$state] ) ? 
$stats->states[$state] : 0;
$count = htmlspecialchars( $wgLang->formatNum( 
$count ) );
-   $link = Linker::link(
+   $link = $linkRenderer->makeLink(
SpecialPage::getTitleFor( 'Code', 
$repoName . '/status/' . $state ),
-   htmlspecialchars( $this->statusDesc( 
$state ) )
+   $this->statusDesc( $state )
);
$wgOut->addHTML( "$link"
. "$count" );
@@ -95,11 +96,12 @@
. wfMessage( 'code-stats-count' )->escaped() . 
'' );
$title = SpecialPage::getTitleFor( 'Code', $repoName . 
"/status/{$status}" );
 
+   $linkRenderer = 
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $array as $user => $count ) {
$count = htmlspecialchars( $wgLang->formatNum( $count ) 
);
-   $link = Linker::link(
+   $link = $linkRenderer->makeLink(
$title,
-   htmlspecialchars( $user ),
+   $user,
array(),
array_merge( $options, array( 'author' => $user 
) )
);
diff --git a/ui/CodeRevisionAuthorView.php b/ui/CodeRevisionAuthorView.php
index 0900a95..2df0855 100644
--- a/ui/CodeRevisionAuthorView.php
+++ b/ui/CodeRevisionAuthorView.php
@@ -32,17 +32,18 @@
 
$linkInfo = $this->linkStatus();
 
+

[MediaWiki-commits] [Gerrit] mediawiki...AkismetKlik[master]: AkismetKlik extension cleanup

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329242 )

Change subject: AkismetKlik extension cleanup
..


AkismetKlik extension cleanup

Bug: T154107
Change-Id: If41f6f1a4d72253d33fa05e94825421df5c8
---
M Akismet.class.php
M AkismetKlik.php
A AkismetKlik_body.php
A extension.json
4 files changed, 126 insertions(+), 129 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Akismet.class.php b/Akismet.class.php
index 0d3cca0..6636a7c 100644
--- a/Akismet.class.php
+++ b/Akismet.class.php
@@ -9,7 +9,7 @@
  * This service performs a number of checks on submitted data and returns
  * whether or not the data is likely to be spam.
  *
- * Please note that in order to use this class, you must have a vaild
+ * Please note that in order to use this class, you must have a valid
  * {@link http://wordpress.com/api-keys/ WordPress API key}.  They are free for
  * non/small-profit types and getting one will only take a couple of minutes.
  *
diff --git a/AkismetKlik.php b/AkismetKlik.php
index e0fa3bd..0161676 100644
--- a/AkismetKlik.php
+++ b/AkismetKlik.php
@@ -1,130 +1,14 @@
 http://www.achingbrain.net/stuff/akismet 
(GPL)
-require_once 'Akismet.class.php';
-
-# Extension credits
-$wgExtensionCredits['other'][] = [
-   'path' => __FILE__,
-   'name' => 'AkismetKlik',
-   'author' => 'Carl Austin Bennett',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:AkismetKlik',
-   'descriptionmsg' => 'akismetklik-desc',
-];
-
-$wgMessagesDirs['AkismetKlik'] = __DIR__ . '/i18n';
-
-# Set site-specific configuration values
-$wgAKkey = '';
-$wgAKSiteUrl = '';
-
-# MediaWiki hooks
-
-# Loader for spam blacklist feature
-# Include this from LocalSettings.php
-$wgHooks['EditFilterMergedContent'][] = 'wfAkismetFilterMergedContent';
-
-/**
- * Get an instance of AkismetKlik and do some first-call initialisation.
- * All actual functionality is implemented in that object
- * @return AkismetKlik
- */
-function wfAkismetKlikObject() {
-   global $wgSpamBlacklistSettings, $wgPreSpamFilterCallback;
-   static $spamObj;
-   if ( !$spamObj ) {
-   $spamObj = new AkismetKlik( $wgSpamBlacklistSettings );
-   $spamObj->previousFilter = $wgPreSpamFilterCallback;
-   }
-
-   return $spamObj;
-}
-
-/**
- * Hook function for EditFilterMergedContent, replaces wfAkismetFilter
- * @param $context IContextSource
- * @param $content Content
- * @param $status Status
- * @param $summary string
- * @param $user User
- * @param $minoredit bool
- * @return bool
- */
-function wfAkismetFilterMergedContent( $context, $content, $status, $summary, 
$user, $minoredit ) {
-   $spamObj = new AkismetKlik();
-   $ret = $spamObj->filter( $context->getTitle(), $content, '', 
$context->getWikiPage() );
-
-   return !$ret;
-}
-
-/**
- * This class provides the interface to the filters
- */
-class AkismetKlik {
-   public $previousFilter;
-
-   /**
-* @param $settings array
-*/
-   function __construct( $settings = [] ) {
-   foreach ( $settings as $name => $value ) {
-   $this->$name = $value;
-   }
-   }
-
-   /**
-* @param Title $title
-* @param Content $content Content of section
-* @param string $section Section number or name
-* @param WikiPage $editPage WikiPage passed from 
EditFilterMergedContent
-* @throws MWException
-* @return bool True if the edit should not be allowed, false otherwise
-* If the return value is true, an error will have been sent to $wgOut
-*/
-   function filter( $title, $content, $section, $wikiPage ) {
-   global $wgUser, $wgAKSiteUrl, $wgAKkey;
-   // @codingStandardsIgnoreStart
-   global $IP;
-   // @codingStandardsIgnoreEnd
-
-   if ( strlen( $wgAKkey ) == 0 ) {
-   throw new MWException( 'Set $wgAKkey in 
LocalSettings.php or relevant configuration file.' );
-   }
-
-   wfProfileIn( __METHOD__ );
-
-   # Run parser to strip SGML comments and such out of the markup
-   $text = ContentHandler::getContentText( $content );
-   $editInfo = $wikiPage->prepareContentForEdit( $content );
-   $out = $editInfo->output;
-   $pgtitle = $title;
-   $links = implode( "\n", array_keys( $out->getExternalLinks() ) 
);
-
-   # Do the match
-   if ( $wgUser->mName == '' ) {
-   $user = $IP;
-   } else {
-   $user = $wgUser->mName;
-   }
-   $akismet = new Akismet( $wgAKSiteUrl, $wgAKkey );
-   $akismet->setCommentAuthor( $user );
-   $akismet->setCommentAuthorEmail(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecated functions in includes/Revision.php

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329766 )

Change subject: Removed deprecated functions in includes/Revision.php
..

Removed deprecated functions in includes/Revision.php

Bug: T61113
Change-Id: Id196de6e50b6db29bef3cb303afa9be6324cda8e
---
M RELEASE-NOTES-1.29
M includes/Revision.php
2 files changed, 10 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/329766/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 774254c..2277861 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -147,6 +147,16 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* Revision::fetchRevision() (deprecated in 1.28) was removed.
+* Revision::getRawUser() (deprecated in 1.25) was removed.
+  Use getUser( Revision::RAW ) instead.
+* Revision::getRawUserText() (deprecated in 1.25) was removed.
+  Use getUserText( Revision::RAW ) instead.
+* Revision::getRawComment() (deprecated in 1.25) was removed.
+  Use getComment( Revision::RAW ) instead.
+* Revision::getText() (deprecated in 1.21) was removed.
+  Use getContent() instead.
+* Revision::userWasLastToEdit() (deprecated in 1.24) was removed.
 
 == Compatibility ==
 
diff --git a/includes/Revision.php b/includes/Revision.php
index aea8488..40878e2 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -364,28 +364,6 @@
}
 
/**
-* Return a wrapper for a series of database rows to
-* fetch all of a given page's revisions in turn.
-* Each row can be fed to the constructor to get objects.
-*
-* @param LinkTarget $title
-* @return ResultWrapper
-* @deprecated Since 1.28
-*/
-   public static function fetchRevision( LinkTarget $title ) {
-   $row = self::fetchFromConds(
-   wfGetDB( DB_REPLICA ),
-   [
-   'rev_id=page_latest',
-   'page_namespace' => $title->getNamespace(),
-   'page_title' => $title->getDBkey()
-   ]
-   );
-
-   return new FakeResultWrapper( $row ? [ $row ] : [] );
-   }
-
-   /**
 * Given a set of conditions, return a ResultWrapper
 * which will return matching database rows with the
 * fields necessary to build Revision objects.
@@ -872,17 +850,6 @@
}
 
/**
-* Fetch revision's user id without regard for the current user's 
permissions
-*
-* @return int
-* @deprecated since 1.25, use getUser( Revision::RAW )
-*/
-   public function getRawUser() {
-   wfDeprecated( __METHOD__, '1.25' );
-   return $this->getUser( self::RAW );
-   }
-
-   /**
 * Fetch revision's username if it's available to the specified 
audience.
 * If the specified audience does not have access to the username, an
 * empty string will be returned.
@@ -916,17 +883,6 @@
}
 
/**
-* Fetch revision's username without regard for view restrictions
-*
-* @return string
-* @deprecated since 1.25, use getUserText( Revision::RAW )
-*/
-   public function getRawUserText() {
-   wfDeprecated( __METHOD__, '1.25' );
-   return $this->getUserText( self::RAW );
-   }
-
-   /**
 * Fetch revision comment if it's available to the specified audience.
 * If the specified audience does not have access to the comment, an
 * empty string will be returned.
@@ -947,17 +903,6 @@
} else {
return $this->mComment;
}
-   }
-
-   /**
-* Fetch revision comment without regard for the current user's 
permissions
-*
-* @return string
-* @deprecated since 1.25, use getComment( Revision::RAW )
-*/
-   public function getRawComment() {
-   wfDeprecated( __METHOD__, '1.25' );
-   return $this->getComment( self::RAW );
}
 
/**
@@ -1033,28 +978,6 @@
$this->loadMutableFields();
 
return (int)$this->mDeleted;
-   }
-
-   /**
-* Fetch revision text if it's available to the specified audience.
-* If the specified audience does not have the ability to view this
-* revision, an empty string will be returned.
-*
-* @param int $audience One of:
-*   Revision::FOR_PUBLIC   to be displayed to all users
-*   Revision::FOR_THIS_USERto be displayed to the given user
-*   Revision::RAW  get the text regardless of permissions
-*

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[REL1_28]: Use default wiki id in example settings.

2016-12-31 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329765 )

Change subject: Use default wiki id in example settings.
..

Use default wiki id in example settings.

Until now, we force the local wiki ID to "mywiki" in the exampel settings.
This triggers a warning if "mywiki" is not known to the SiteLookup.

Instead of forcing a fixed value, we can just rely on the default for the
local site ID, which is the wiki's database name. That is consistent with
the conventions used on the WMF cluster.

Bug: T153729
Change-Id: Ia0d578a8215280592001cfa5f413fb76e15a2d2f
(cherry picked from commit 8e5d3af54d8c5da0783ce1427c8deaf2d1a5d284)
---
M client/config/WikibaseClient.example.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/65/329765/1

diff --git a/client/config/WikibaseClient.example.php 
b/client/config/WikibaseClient.example.php
index 1a32481..4ce9e51 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -19,7 +19,8 @@
 }
 
 // The global site ID by which this wiki is known on the repo.
-$wgWBClientSettings['siteGlobalID'] = "mywiki";
+// Defaults to $wgDBname.
+// $wgWBClientSettings['siteGlobalID'] = "mywiki";
 
 $wgWBClientSettings['injectRecentChanges'] = true;
 $wgWBClientSettings['showExternalRecentChanges'] = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/329765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0d578a8215280592001cfa5f413fb76e15a2d2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Daniel Kinzler 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Replace Linker::link() with LinkRenderer

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329763 )

Change subject: Replace Linker::link() with LinkRenderer
..


Replace Linker::link() with LinkRenderer

Bug: T149346
Change-Id: I1c9b0d8982378a547f0873e0a8d6d0ac2297d4a8
---
M QuestionGameHome.body.php
M QuizLeaderboard.php
M ViewQuizzes.php
3 files changed, 13 insertions(+), 12 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index bdca885..876d5ff 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -351,7 +351,7 @@
}
 
$key = md5( $this->SALT . $row->q_id );
-   $buttons = Linker::link(
+   $buttons = $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'quizgame-edit' )->text(),
array(),
@@ -966,7 +966,7 @@

";
 
-   $editLinks = Linker::link(
+   $editLinks = $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'quizgame-admin-panel-title' 
)->text(),
array(),
diff --git a/QuizLeaderboard.php b/QuizLeaderboard.php
index bbb4ea7..d800c6e 100644
--- a/QuizLeaderboard.php
+++ b/QuizLeaderboard.php
@@ -128,7 +128,7 @@
$output .= '';
 
$output .= '' .
-   Linker::link(
+   $this->getLinkRenderer()->makeLink(
$quizgame_title,
$this->msg( 'quizgame-admin-back' )->text(),
array(),
@@ -171,4 +171,4 @@
 
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
diff --git a/ViewQuizzes.php b/ViewQuizzes.php
index 35d3fbe..979da48 100644
--- a/ViewQuizzes.php
+++ b/ViewQuizzes.php
@@ -48,15 +48,16 @@
$limitvalue = $page * $limit - ( $limit );
}
 
+   $linkRenderer = $this->getLinkRenderer();
$quizGameHome = SpecialPage::getTitleFor( 'QuizGameHome' );
$output = '' .
-   Linker::link(
+   $linkRenderer->makeLink(
$quizGameHome,
$this->msg( 'quizgame-playneverending' 
)->text(),
array(),
array( 'questionGameAction' => 'launchGame' )
) . ' - ' .
-   Linker::link(
+   $linkRenderer->makeLink(
$quizGameHome,
$this->msg( 'quizgame-viewquizzes-create' 
)->text(),
array(),
@@ -83,7 +84,7 @@
if( $type == 'newest' ) {
$linkQueryParameters['type'] = 'most';
$output .= '' . $this->msg( 'quizgame-newest' 
)->text() . '
-   ' . Linker::link(
+   ' . $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-popular' 
)->text(),
array(),
@@ -91,7 +92,7 @@
) . '';
} else {
$linkQueryParameters['type'] = 'newest';
-   $output .= '' . Linker::link(
+   $output .= '' . $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-newest' )->text(),
array(),
@@ -185,7 +186,7 @@
if( $page > 1 ) {
$linkQueryParameters['type'] = 'most';
$linkQueryParameters['page'] = ( $page - 1 );
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-prev' )->text(),
array(),
@@ -209,7 +210,7 @@
} else {
$linkQueryParameters['type'] = 'most';
$linkQueryParameters['page'] = $i;
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$title,

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace mocks of DatabaseMysql by DatabaseMysqli

2016-12-31 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329764 )

Change subject: Replace mocks of DatabaseMysql by DatabaseMysqli
..

Replace mocks of DatabaseMysql by DatabaseMysqli

The class DatabaseMysql corresponds to the PHP extension 'mysql' which is
deprecated since PHP 5.5, and the class DatabaseMysqli corresponds to the
PHP extension 'mysqli' which is the current MySQL driver. Given the class
DatabaseMysql is likely to be removed in the future, this change is a
first step towards this.

Bug: T120333
Change-Id: I7b8363838449cae09b360221d8f50ace3a008f11
---
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/db/LBFactoryTest.php
M tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
M tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
M tests/phpunit/includes/utils/BatchRowUpdateTest.php
5 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/329764/1

diff --git a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php 
b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
index dbb126f..81b75de 100644
--- a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
@@ -170,7 +170,7 @@
}
 
function getMockForViews() {
-   $db = $this->getMockBuilder( 'DatabaseMysql' )
+   $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->setMethods( [ 'fetchRow', 'query' ] )
->getMock();
@@ -314,7 +314,7 @@
 * @dataProvider provideLagAmounts
 */
function testPtHeartbeat( $lag ) {
-   $db = $this->getMockBuilder( 'DatabaseMysql' )
+   $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->setMethods( [
'getLagDetectionMethod', 'getHeartbeatData', 
'getMasterServerInfo' ] )
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php 
b/tests/phpunit/includes/db/LBFactoryTest.php
index d8773f8..573b395 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -29,7 +29,7 @@
 * @dataProvider getLBFactoryClassProvider
 */
public function testGetLBFactoryClass( $expected, $deprecated ) {
-   $mockDB = $this->getMockBuilder( 'DatabaseMysql' )
+   $mockDB = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
 
@@ -178,7 +178,7 @@
$mPos = new MySQLMasterPos( 'db1034-bin.000976', '843431247' );
 
$now = microtime( true );
-   $mockDB = $this->getMockBuilder( 'DatabaseMysql' )
+   $mockDB = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$mockDB->method( 'writesOrCallbacksPending' )->willReturn( true 
);
diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php 
b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
index 8366541..410d2df 100644
--- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
@@ -112,7 +112,7 @@
}
 
protected function getMocks() {
-   $dbMock = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbMock = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
 
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php 
b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 92a54fa..d3f9374 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -25,7 +25,7 @@
]
] );
 
-   $dbMock = $this->getMockBuilder( 'DatabaseMysql' )
+   $dbMock = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
 
diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php 
b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
index cb1b3d2..6506d58 100644
--- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php
+++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
@@ -237,7 +237,7 @@
protected function mockDb() {
// @TODO: mock from Database
// FIXME: the constructor normally sets mAtomicLevels and 
mSrvCache
-   $databaseMysql = $this->getMockBuilder( 'DatabaseMysql' )
+

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Correct categorization of 'pt-br' and similar language codes

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329733 )

Change subject: Correct categorization of 'pt-br' and similar language codes
..


Correct categorization of 'pt-br' and similar language codes

wfBCP47 can return language codes like 'pt-BR' and 'shi-Latn', whereas
MediaWiki uses only lowercase for its codes ('pt-br', 'shi-latn'). When
looking up the language names, we need to make sure we use normalized
lowercase codes.

Also avoid ever placing pages in illegally-titled categories, by using
Title::makeTitleSafe to ensure normalization of the category name.

Bug: T146778
Change-Id: I16059db9d1f2060a760223cc9c4488a988a04475
---
M BabelBox/LanguageBabelBox.php
M BabelLanguageCodes.class.php
M tests/phpunit/BabelTest.php
3 files changed, 17 insertions(+), 7 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index d2f5edc..9cd474f 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -19,6 +19,7 @@
 use BabelAutoCreate;
 use BabelLanguageCodes;
 use Language;
+use MWException;
 use Title;
 
 /**
@@ -136,23 +137,25 @@
self::getCategoryName( $wgBabelMainCategory, 
$language );
}
 
+   $languageForMw = strtolower( $language );
+
// Give grep a chance to find the usages:
// babel-0-n, babel-1-n, babel-2-n, babel-3-n, babel-4-n, 
babel-5-n, babel-N-n
$text = wfMessage( "babel-$level-n",
$categoryLevel, $categoryMain, '', $title->getDBkey()
-   )->inLanguage( $language )->text();
+   )->inLanguage( $languageForMw )->text();
 
-   $fallbackLanguage = Language::getFallbackFor( $language );
+   $fallbackLanguage = Language::getFallbackFor( $languageForMw );
$fallback = wfMessage( "babel-$level-n",
$categoryLevel, $categoryMain, '', $title->getDBkey()
-   )->inLanguage( $fallbackLanguage ? $fallbackLanguage : 
$language )->text();
+   )->inLanguage( $fallbackLanguage ? $fallbackLanguage : 
$languageForMw )->text();
 
// Give grep a chance to find the usages:
// babel-0, babel-1, babel-2, babel-3, babel-4, babel-5, babel-N
if ( $text == $fallback ) {
$text = wfMessage( "babel-$level",
$categoryLevel, $categoryMain, $name, 
$title->getDBkey()
-   )->inLanguage( $language )->text();
+   )->inLanguage( $languageForMw )->text();
}
 
return $text;
@@ -201,6 +204,7 @@
 * Replace the placeholder variables from the category names 
configurtion
 * array with actual values.
 *
+* @throws MWException if the category name is not a valid title
 * @param string $category Category name (containing variables).
 * @param string $code Language code of category.
 * @return string Category name with variables replaced.
@@ -214,7 +218,11 @@
] );
 
// Normalize using Title
-   return Title::makeTitle( NS_CATEGORY, $category )->getDBkey();
+   $title = Title::makeTitleSafe( NS_CATEGORY, $category );
+   if ( !$title ) {
+   throw new MWException( "Invalid babel category name 
'$category'" );
+   }
+   return $title->getDBkey();
}
 
 }
diff --git a/BabelLanguageCodes.class.php b/BabelLanguageCodes.class.php
index 9dffeaf..dfd2e73 100644
--- a/BabelLanguageCodes.class.php
+++ b/BabelLanguageCodes.class.php
@@ -54,6 +54,7 @@
if ( $code === false ) {
return false;
}
+   $code = strtolower( $code );
 
$language = $language === null ? $code : $language;
$names = Language::fetchLanguageNames( $language, 'all' );
diff --git a/tests/phpunit/BabelTest.php b/tests/phpunit/BabelTest.php
index 9352669..3a463da 100644
--- a/tests/phpunit/BabelTest.php
+++ b/tests/phpunit/BabelTest.php
@@ -33,6 +33,7 @@
'wgBabelUseDatabase' => true,
'wgBabelCentralApi' => false,
'wgBabelCentralDb' => false,
+   'wgCapitalLinks' => false,
] );
$user = User::newFromName( 'User-1' );
$user->addToDatabase();
@@ -166,8 +167,8 @@
. '! dir="ltr" | [[(babel-portal: zh-Hant)|zh-Hant]]'
. '-N'
. "\n"
-   . '| dir="ltr" lang="zh-Hant" | This user has a 
[[:Category:zh-Hant-N|native]] '
-

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add README.md from the abandoned WikibaseBrowserTests reposi...

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329603 )

Change subject: Add README.md from the abandoned WikibaseBrowserTests repository
..


Add README.md from the abandoned WikibaseBrowserTests repository

Change-Id: I092efe05cdfddfc195b62ce9e7fb79aeb64fd05b
---
A tests/browser/README.md
1 file changed, 42 insertions(+), 0 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/README.md b/tests/browser/README.md
new file mode 100644
index 000..eb3a70a
--- /dev/null
+++ b/tests/browser/README.md
@@ -0,0 +1,42 @@
+Wikidata Browser Tests
+==
+
+This directory contains the browser tests for
+[Wikidata](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikidata).
+
+## Executing tests
+
+Update/install gems:
+```shell
+bundle install
+```
+
+Switch to the `tests/browser/` directory to run all tests:
+```shell
+bundle exec cucumber
+```
+
+Run a specific feature:
+```shell
+bundle exec cucumber features/label.feature
+```
+
+Run a specific scenario:
+```shell
+bundle exec cucumber features/label.feature:17
+```
+
+Run only tests with a specific tag:
+```shell
+bundle exec cucumber --tag @ui_only
+```
+
+Run only tests that are supposed to be executed locally:
+```shell
+bundle exec cucumber --tag @local_config
+```
+
+## Configuration and setup
+
+For setup and configuration please see
+[Browser Testing for 
Wikidata](https://www.mediawiki.org/wiki/Wikibase/Programmer%27s_guide_to_Wikibase#Browser_Testing_for_Wikidata).

-- 
To view, visit https://gerrit.wikimedia.org/r/329603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I092efe05cdfddfc195b62ce9e7fb79aeb64fd05b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Replace Linker::link() with LinkRenderer

2016-12-31 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329763 )

Change subject: Replace Linker::link() with LinkRenderer
..

Replace Linker::link() with LinkRenderer

Bug: T149346
Change-Id: I1c9b0d8982378a547f0873e0a8d6d0ac2297d4a8
---
M QuestionGameHome.body.php
M QuizLeaderboard.php
M ViewQuizzes.php
3 files changed, 13 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuizGame 
refs/changes/63/329763/1

diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index bdca885..876d5ff 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -351,7 +351,7 @@
}
 
$key = md5( $this->SALT . $row->q_id );
-   $buttons = Linker::link(
+   $buttons = $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'quizgame-edit' )->text(),
array(),
@@ -966,7 +966,7 @@

";
 
-   $editLinks = Linker::link(
+   $editLinks = $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'quizgame-admin-panel-title' 
)->text(),
array(),
diff --git a/QuizLeaderboard.php b/QuizLeaderboard.php
index bbb4ea7..d800c6e 100644
--- a/QuizLeaderboard.php
+++ b/QuizLeaderboard.php
@@ -128,7 +128,7 @@
$output .= '';
 
$output .= '' .
-   Linker::link(
+   $this->getLinkRenderer()->makeLink(
$quizgame_title,
$this->msg( 'quizgame-admin-back' )->text(),
array(),
@@ -171,4 +171,4 @@
 
$out->addHTML( $output );
}
-}
\ No newline at end of file
+}
diff --git a/ViewQuizzes.php b/ViewQuizzes.php
index 35d3fbe..979da48 100644
--- a/ViewQuizzes.php
+++ b/ViewQuizzes.php
@@ -48,15 +48,16 @@
$limitvalue = $page * $limit - ( $limit );
}
 
+   $linkRenderer = $this->getLinkRenderer();
$quizGameHome = SpecialPage::getTitleFor( 'QuizGameHome' );
$output = '' .
-   Linker::link(
+   $linkRenderer->makeLink(
$quizGameHome,
$this->msg( 'quizgame-playneverending' 
)->text(),
array(),
array( 'questionGameAction' => 'launchGame' )
) . ' - ' .
-   Linker::link(
+   $linkRenderer->makeLink(
$quizGameHome,
$this->msg( 'quizgame-viewquizzes-create' 
)->text(),
array(),
@@ -83,7 +84,7 @@
if( $type == 'newest' ) {
$linkQueryParameters['type'] = 'most';
$output .= '' . $this->msg( 'quizgame-newest' 
)->text() . '
-   ' . Linker::link(
+   ' . $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-popular' 
)->text(),
array(),
@@ -91,7 +92,7 @@
) . '';
} else {
$linkQueryParameters['type'] = 'newest';
-   $output .= '' . Linker::link(
+   $output .= '' . $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-newest' )->text(),
array(),
@@ -185,7 +186,7 @@
if( $page > 1 ) {
$linkQueryParameters['type'] = 'most';
$linkQueryParameters['page'] = ( $page - 1 );
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$title,
$this->msg( 'quizgame-prev' )->text(),
array(),
@@ -209,7 +210,7 @@
} else {
$linkQueryParameters['type'] = 'most';
$linkQueryParameters['page'] = $i;
-   $output .= Linker::link(
+   $output .= $linkRenderer->makeLink(
$title,

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update Wikidata property blacklist

2016-12-31 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329762 )

Change subject: Update Wikidata property blacklist
..

Update Wikidata property blacklist

Change-Id: I6140277ca0e2db69179949f50ccd3c9e2a3090e8
---
M wmf-config/Wikibase.php
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/62/329762/2

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index ab92001..06baec0 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -123,11 +123,9 @@
$wgPropertySuggesterDeprecatedIds = [
143, // imported from
/**
-* Deprecated properties
+* Deprecated properties (none at the moment)
 * @see 
https://www.wikidata.org/wiki/Special:WhatLinksHere/Q18644427
 */
-   357, // (OBSOLETE) title (use P1476, "title")
-   513, // (OBSOLETE) birth name (use P1477)
/**
 * @see https://www.wikidata.org/w/index.php?oldid=335040857
 */

-- 
To view, visit https://gerrit.wikimedia.org/r/329762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6140277ca0e2db69179949f50ccd3c9e2a3090e8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: TitleValue: Include the invalid DB key in the message when t...

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329734 )

Change subject: TitleValue: Include the invalid DB key in the message when 
throwing
..


TitleValue: Include the invalid DB key in the message when throwing

The current output "Bad value for parameter $dbkey: invalid DB key" is
useless for actually working out which DB key is to blame.

Bug: T146778
Change-Id: Iaf57e25ab27b5065469c5dc5de0a1b881c48210c
---
M includes/title/TitleValue.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/title/TitleValue.php b/includes/title/TitleValue.php
index 597bf2f..7c370f1 100644
--- a/includes/title/TitleValue.php
+++ b/includes/title/TitleValue.php
@@ -78,7 +78,8 @@
Assert::parameterType( 'string', $interwiki, '$interwiki' );
 
// Sanity check, no full validation or normalization applied 
here!
-   Assert::parameter( !preg_match( '/^_|[ \r\n\t]|_$/', $dbkey ), 
'$dbkey', 'invalid DB key' );
+   Assert::parameter( !preg_match( '/^_|[ \r\n\t]|_$/', $dbkey ), 
'$dbkey',
+   "invalid DB key '$dbkey'" );
Assert::parameter( $dbkey !== '', '$dbkey', 'should not be 
empty' );
 
$this->namespace = $namespace;

-- 
To view, visit https://gerrit.wikimedia.org/r/329734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf57e25ab27b5065469c5dc5de0a1b881c48210c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove doubled title on Special:MIMESearch

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/290493 )

Change subject: Remove doubled title on Special:MIMESearch
..


Remove doubled title on Special:MIMESearch

Having a page title (from skin) and the same text in the first
form on that page (directly after the page title) is doubled
and doesn't look very good. This change removes the form title
completely, as it is obvious enough what the form does (the input
has it's own label and the page title is clearly visible).

Follow up: I6c8b0f3be92bc455fe62846508d0b21c778b993d

Change-Id: I56c2f05ebe5b15f50eba6297c39326e1504b8229
---
M includes/specials/SpecialMIMEsearch.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  TTO: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialMIMEsearch.php 
b/includes/specials/SpecialMIMEsearch.php
index d8a468f..15696bc 100644
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -120,7 +120,6 @@
];
 
HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() 
)
-   ->setWrapperLegendMsg( 'mimesearch' )
->setSubmitTextMsg( 'ilsubmit' )
->setAction( $this->getPageTitle()->getLocalURL() )
->setMethod( 'get' )

-- 
To view, visit https://gerrit.wikimedia.org/r/290493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I56c2f05ebe5b15f50eba6297c39326e1504b8229
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sethakill 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix and improve default regexes

2016-12-31 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329761 )

Change subject: Fix and improve default regexes
..

Fix and improve default regexes

- Remove unneccessary flags.
- Clean up 'header' using multiline.
- Expand 'pre' to support HTML attributes (mostly 'style').
- Update 'property' to support parameters (currently, it supports
  "|from=" but it might support more in the future).
- Localize 'property' and 'invoke' using magic words.

Change-Id: Ib805bf70cb1cc99711138d7d6c7e40971f31b602
---
M pywikibot/textlib.py
1 file changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/61/329761/2

diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 9f7782e..2908ee1 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -221,13 +221,13 @@
 _regex_cache.update({
 'comment':  re.compile(r'(?s)'),
 # section headers
-'header':   re.compile(r'\r?\n=+.+=+ *\r?\n'),
+'header':   re.compile(r'(?m)^=+.+=+ *$'),
 # preformatted text
-'pre':  re.compile(r'(?ism).*?'),
+'pre':  re.compile(r'(?is)].*?'),
 'source':   re.compile(r'(?is)'),
-'score':re.compile(r'(?ism)].*?'),
+'score':re.compile(r'(?is)].*?'),
 # inline references
-'ref':  re.compile(r'(?ism)].*?'),
+'ref':  re.compile(r'(?is)].*?'),
 'template': NESTED_TEMPLATE_REGEX,
 # lines that start with a space are shown in a monospace font and
 # have whitespace preserved.
@@ -247,11 +247,13 @@
  site.validLanguageLinks() +
  list(site.family.obsolete.keys(,
 # Wikibase property inclusions
-'property': re.compile(r'(?i)\{\{\s*#property:\s*p\d+\s*\}\}'),
+'property': (r'(?i)\{\{\s*#(%s):\s*p\d+.*?\}\}',
+ lambda site: 
'|'.join(site.getmagicwords('property'))),
 # Module invocations (currently only Lua)
-'invoke':   re.compile(r'(?i)\{\{\s*#invoke:.*?}\}'),
+'invoke':   (r'(?i)\{\{\s*#(%s):.*?\}\}',
+ lambda site: '|'.join(site.getmagicwords('invoke'))),
 # categories
-'category': ('\[\[ *(?:%s)\s*:.*?\]\]',
+'category': (r'\[\[ *(?:%s)\s*:.*?\]\]',
  lambda site: '|'.join(site.namespaces[14])),
 # files
 'file': (FILE_LINK_REGEX,

-- 
To view, visit https://gerrit.wikimedia.org/r/329761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib805bf70cb1cc99711138d7d6c7e40971f31b602
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] openzim[master]: Add libzim.pc for pkg-config

2016-12-31 Thread Kelson (Code Review)

Kelson has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329759 )

Change subject: Add libzim.pc for pkg-config
..


Add libzim.pc for pkg-config

This registers the libzim library with pkg-config, mostly so adding it
as a dependency with meson works as expected.

After building and installing the library, the following should work:
 $ pkg-config --modversion libzim

Change-Id: Ieb41c0b3a9445e6d651f8c0d528d30c2ebaf06dc
---
M zimlib/.gitignore
M zimlib/Makefile.am
M zimlib/configure.ac
A zimlib/libzim.pc.in
4 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Kelson: Verified; Looks good to me, approved



diff --git a/zimlib/.gitignore b/zimlib/.gitignore
index 0a4a991..550c09a 100644
--- a/zimlib/.gitignore
+++ b/zimlib/.gitignore
@@ -27,3 +27,4 @@
 examples/createZimExample
 src/tools/zimdump
 src/tools/zimsearch
+libzim.pc
diff --git a/zimlib/Makefile.am b/zimlib/Makefile.am
index 504fe34..4053e7f 100644
--- a/zimlib/Makefile.am
+++ b/zimlib/Makefile.am
@@ -13,3 +13,6 @@
include \
$(UNITTEST_DIR) \
examples
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libzim.pc
diff --git a/zimlib/configure.ac b/zimlib/configure.ac
index 0472538..da71e40 100644
--- a/zimlib/configure.ac
+++ b/zimlib/configure.ac
@@ -146,6 +146,7 @@
 # output
 #
 AC_CONFIG_FILES([
+  libzim.pc
   Makefile
   src/Makefile
   src/tools/Makefile
diff --git a/zimlib/libzim.pc.in b/zimlib/libzim.pc.in
new file mode 100644
index 000..bbef0d6
--- /dev/null
+++ b/zimlib/libzim.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libzim
+Description: implements read and write methods for ZIM files
+Version: @VERSION@
+Libs: -L${libdir} -lzim
+Cflags: -I${includedir}
+

-- 
To view, visit https://gerrit.wikimedia.org/r/329759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb41c0b3a9445e6d651f8c0d528d30c2ebaf06dc
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Kelson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-31T10:00:01+0000

2016-12-31 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329760 )

Change subject: New Wikidata Build - 2016-12-31T10:00:01+
..

New Wikidata Build - 2016-12-31T10:00:01+

Change-Id: If832b428157833e25c3859a83dad95bb76ac995e
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/en.json
M extensions/Wikibase/client/i18n/qqq.json
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M extensions/Wikibase/repo/includes/Content/EntityContent.php
M 
extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.languageLabelDescriptionAliases.js
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M vendor/composer/installed.json
11 files changed, 137 insertions(+), 61 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/60/329760/1

diff --git a/composer.lock b/composer.lock
index db228bc..07c877c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -938,7 +938,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org;,
-"reference": "cb652cdb01b6b0317aaf3278f1fe951aae4307b8"
+"reference": "93892fd220415dadfcc51665dd2ff6c107ff1f3a"
 },
 "require": {
 "php": ">=5.3.0"
@@ -982,7 +982,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-12-12 21:45:02"
+"time": "2016-12-28 12:14:31"
 },
 {
 "name": "wikibase/constraints",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "49d46a36b4cd582fa67e72b6ea73953d5f833695"
+"reference": "484b689477357d7ad6240205ec918bce64c85028"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/49d46a36b4cd582fa67e72b6ea73953d5f833695;,
-"reference": "49d46a36b4cd582fa67e72b6ea73953d5f833695",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/484b689477357d7ad6240205ec918bce64c85028;,
+"reference": "484b689477357d7ad6240205ec918bce64c85028",
 "shasum": ""
 },
 "require": {
@@ -1663,7 +1663,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-30 04:22:49"
+"time": "2016-12-31 04:21:49"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.php 
b/extensions/Wikibase/client/WikibaseClient.php
index df99683..07a6ad8 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -70,7 +70,7 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks, 
$wgExtensionFunctions;
global $wgAPIListModules, $wgAPIMetaModules, $wgAPIPropModules, 
$wgSpecialPages;
global $wgResourceModules, $wgWBClientSettings, $wgRecentChangesFlags, 
$wgMessagesDirs;
-   global $wgJobClasses, $wgWBClientDataTypes, $wgWBClientEntityTypes;
+   global $wgJobClasses, $wgTrackingCategories, $wgWBClientDataTypes, 
$wgWBClientEntityTypes;
 
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -102,6 +102,9 @@
$wgExtensionMessagesFiles['Wikibaseclientalias'] = __DIR__ . 
'/WikibaseClient.i18n.alias.php';
$wgExtensionMessagesFiles['wikibaseclientmagic'] = __DIR__ . 
'/WikibaseClient.i18n.magic.php';
 
+   // Tracking categories
+   $wgTrackingCategories[] = 'unresolved-property-category';
+
// Hooks
$wgHooks['UnitTestsList'][] = 
'\Wikibase\ClientHooks::registerUnitTests';
$wgHooks['BaseTemplateToolbox'][] = 
'\Wikibase\ClientHooks::onBaseTemplateToolbox';
diff --git a/extensions/Wikibase/client/i18n/en.json 
b/extensions/Wikibase/client/i18n/en.json
index 8642307..b14c365 100644
--- a/extensions/Wikibase/client/i18n/en.json
+++ b/extensions/Wikibase/client/i18n/en.json
@@ -115,5 +115,7 @@
"notification-bundle-header-page-connection": "$3 and 
{{PLURAL:$4|one other page|$4 other pages|100=99+ other pages}} were 
{{GENDER:$2|connected}} to {{WBREPONAME}} items.",
"notification-link-text-view-item": "{{GENDER:$1|View}}

[MediaWiki-commits] [Gerrit] openzim[master]: Add libzim.pc for pkg-config

2016-12-31 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329759 )

Change subject: Add libzim.pc for pkg-config
..

Add libzim.pc for pkg-config

This registers the libzim library with pkg-config, mostly so adding it
as a dependency with meson works as expected.

After building and installing the library, the following should work:
 $ pkg-config --modversion libzim

Change-Id: Ieb41c0b3a9445e6d651f8c0d528d30c2ebaf06dc
---
M zimlib/.gitignore
M zimlib/Makefile.am
M zimlib/configure.ac
A zimlib/libzim.pc.in
4 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/openzim refs/changes/59/329759/1

diff --git a/zimlib/.gitignore b/zimlib/.gitignore
index 0a4a991..550c09a 100644
--- a/zimlib/.gitignore
+++ b/zimlib/.gitignore
@@ -27,3 +27,4 @@
 examples/createZimExample
 src/tools/zimdump
 src/tools/zimsearch
+libzim.pc
diff --git a/zimlib/Makefile.am b/zimlib/Makefile.am
index 504fe34..4053e7f 100644
--- a/zimlib/Makefile.am
+++ b/zimlib/Makefile.am
@@ -13,3 +13,6 @@
include \
$(UNITTEST_DIR) \
examples
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libzim.pc
diff --git a/zimlib/configure.ac b/zimlib/configure.ac
index 0472538..da71e40 100644
--- a/zimlib/configure.ac
+++ b/zimlib/configure.ac
@@ -146,6 +146,7 @@
 # output
 #
 AC_CONFIG_FILES([
+  libzim.pc
   Makefile
   src/Makefile
   src/tools/Makefile
diff --git a/zimlib/libzim.pc.in b/zimlib/libzim.pc.in
new file mode 100644
index 000..bbef0d6
--- /dev/null
+++ b/zimlib/libzim.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libzim
+Description: implements read and write methods for ZIM files
+Version: @VERSION@
+Libs: -L${libdir} -lzim
+Cflags: -I${includedir}
+

-- 
To view, visit https://gerrit.wikimedia.org/r/329759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb41c0b3a9445e6d651f8c0d528d30c2ebaf06dc
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add installer to MessagesDirs

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329676 )

Change subject: Add installer to MessagesDirs
..


Add installer to MessagesDirs

Also add all MessagesDirs to banana check
Fixed a typo in folder name of banana check

Change-Id: Idf999f68db38a115b369a484393deec3f17b19dd
---
M Gruntfile.js
M extension.json
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gruntfile.js b/Gruntfile.js
index bbc8978..6c9cfd3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,14 +18,17 @@
},
banana: {
all: [
+   'i18n/api/',
'i18n/core/',
'i18n/credits/',
-   'i18n/diferred/',
+   'i18n/deferred/',
'i18n/diagnostics/',
'i18n/extjs/',
'i18n/extjs-portal/',
+   'i18n/filerepo/',
'i18n/installer/',
'i18n/notifications/',
+   'i18n/upload',
'i18n/validator/'
]
},
diff --git a/extension.json b/extension.json
index 482062b..fb79609 100644
--- a/extension.json
+++ b/extension.json
@@ -347,6 +347,9 @@
 ],
 "BlueSpice.FileRepo": [
 "i18n/filerepo"
+],
+"BlueSpice.Installer": [
+"i18n/installer"
 ]
 },
 "ExtensionMessagesFiles": {

-- 
To view, visit https://gerrit.wikimedia.org/r/329676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf999f68db38a115b369a484393deec3f17b19dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Remove duplicate manifest_version from UserManager/extension...

2016-12-31 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329719 )

Change subject: Remove duplicate manifest_version from 
UserManager/extension.json
..


Remove duplicate manifest_version from UserManager/extension.json

Change-Id: I4c74901ba587ac8882e9b6d03b569fbc77456cc7
(cherry picked from commit fabf16a73e45b2c76b31423039ec5b896a3d8811)
---
M UserManager/extension.json
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UserManager/extension.json b/UserManager/extension.json
index 65a5726..d2e8459 100644
--- a/UserManager/extension.json
+++ b/UserManager/extension.json
@@ -1,5 +1,4 @@
 {
-   "manifest_version": "0.0.1",
"name": "UserManager",
"author": [
"Sebastian Ulbricht",

-- 
To view, visit https://gerrit.wikimedia.org/r/329719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c74901ba587ac8882e9b6d03b569fbc77456cc7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed unneeded apihelp messages

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329677 )

Change subject: Removed unneeded apihelp messages
..


Removed unneeded apihelp messages

The needed message already exists with a suffix of '-description'

Change-Id: Ie722782d290fac0044f4859514571b7036864ca7
---
M PageTemplates/i18n/en.json
M PageTemplates/i18n/qqq.json
M Review/i18n/en.json
M Review/i18n/qqq.json
4 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageTemplates/i18n/en.json b/PageTemplates/i18n/en.json
index 3ff5e22..b0ffbd1 100644
--- a/PageTemplates/i18n/en.json
+++ b/PageTemplates/i18n/en.json
@@ -6,8 +6,6 @@
},
"bs-pagetemplates-desc": "Displays a list of templates marked as page 
templates",
"prefs-pagetemplates": "Page templates",
-   "apihelp-bs-pagetemplates-store": "Provides a list of available 
templates.",
-   "apihelp-bs-pagetemplates-tasks": "Provides create, update and delete 
tasks for templates.",
"bs-pagetemplates-empty-page": "Empty page",
"bs-pagetemplates-empty-page-desc": "Start with an empty page.",
"bs-pagetemplatesadmin-label": "Page templates",
diff --git a/PageTemplates/i18n/qqq.json b/PageTemplates/i18n/qqq.json
index 39a095f..0ebad1d 100644
--- a/PageTemplates/i18n/qqq.json
+++ b/PageTemplates/i18n/qqq.json
@@ -12,8 +12,6 @@
},
"bs-pagetemplates-desc": "Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of page templates extension",
"prefs-pagetemplates": "Used in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], headline for avatars section in 
preferences.\n{{Identical|Page template}}",
-   "apihelp-bs-pagetemplates-store": "Describes the API endpoint that 
provides a list of page templates.",
-   "apihelp-bs-pagetemplates-tasks": "Describes the API endpoint that 
provides tasks for the PageTemplate extension.",
"bs-pagetemplates-empty-page": "Anchor text for empty 
page\n{{Identical|Empty page}}",
"bs-pagetemplates-empty-page-desc": "Text for start with an empty 
page.",
"bs-pagetemplatesadmin-label": "Anchor text in admin tab for page 
templates \n{{Identical|Page template}}",
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index e7f7494..8eb4212 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -110,9 +110,7 @@
"notification-bs-review-finish-and-autoflag-summary": "[[User:$1|$1]] 
{{GENDER:$1|has finished}} the review process and automatically marked $3 as 
stable",
"notification-bs-review-finish-and-autoflag-subject": "$1 
{{GENDER:$1|has finished}} the review of \"$2\"",
"notification-bs-review-finish-and-autoflag-body": "$1 {{GENDER:$1|has 
finished}} your review on \"$2\". The page got marked as stable automatically.",
-   "apihelp-bs-reviewoverview-store": "Lists an overview of review 
processes",
"apihelp-bs-reviewoverview-store-param-userid": "Filters the list 
review processes by user iduserID",
-   "apihelp-bs-review-tasks": "Allows manipulation of reviews",
"apihelp-bs-reviewpossiblereviewers-store-param-articleid": "Filters 
the list of users by permissions for articleId",
"apihelp-bs-reviewpossiblereviewers-store-description": "Lists users 
that can be part of a review process. Allows sorting, filtering and pagination. 
Implements ExtJS Store parameters.",
"apihelp-bs-reviewoverview-store-description": "Lists an overview of 
review processes. Allows sorting, filtering and pagination. Implements ExtJS 
Store parameters.",
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index 91971f2..bcef761 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -117,9 +117,7 @@
"notification-bs-review-finish-and-autoflag-summary": "Notification 
about reviewer finishes review and autoflags as stable - flyout/archive 
page\n\nParameters:\n* $1 - name of the user accepting a review\n* $2 - name of 
page (unused)\n* $3 - link to page",
"notification-bs-review-finish-and-autoflag-subject": "Notification 
about reviewer finishes review and autoflags as stable - email 
subject\n\nParameters:\n* $1 - name of the user accepting a review\n* $2 - name 
of page\n* $3 - link to page (unused)",
"notification-bs-review-finish-and-autoflag-body": "Notification about 
reviewer finishes review and autoflags as stable - email body\n\nParameters:\n* 
$1 - name of the user accepting a review\n* $2 - name of page\n* $3 - link to 
page (unused)",
-   "apihelp-bs-reviewoverview-store": "Describes the API endpoint that 
lists an overview of Review",
"apihelp-bs-reviewoverview-store-param-userid": "Describes the 
userID

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix descriptionmsg of PermissionManager in extension.json

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329757 )

Change subject: Fix descriptionmsg of PermissionManager in extension.json
..


Fix descriptionmsg of PermissionManager in extension.json

It was using a description of another extenstion

Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
---
M PermissionManager/extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PermissionManager/extension.json b/PermissionManager/extension.json
index 116bf6b..0995aa3 100644
--- a/PermissionManager/extension.json
+++ b/PermissionManager/extension.json
@@ -7,7 +7,7 @@
"Markus Glaser",
"Stephan Muggli"
],
-   "descriptionmsg": "bs-articleinfo-desc",
+   "descriptionmsg": "bs-permissionmanager-desc",
"type": "bluespice",
"bsgExtensions": {
"PermissionManager": {

-- 
To view, visit https://gerrit.wikimedia.org/r/329757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Fix descriptionmsg of PermissionManager in extension.json

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329684 )

Change subject: Fix descriptionmsg of PermissionManager in extension.json
..


Fix descriptionmsg of PermissionManager in extension.json

It was using a description of another extenstion

Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
---
M PermissionManager/extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PermissionManager/extension.json b/PermissionManager/extension.json
index 57b4456..de5275e 100644
--- a/PermissionManager/extension.json
+++ b/PermissionManager/extension.json
@@ -7,7 +7,7 @@
"Markus Glaser",
"Stephan Muggli"
],
-   "descriptionmsg": "bs-articleinfo-desc",
+   "descriptionmsg": "bs-permissionmanager-desc",
"type": "bluespice",
"bsgExtensions": {
"PermissionManager": {

-- 
To view, visit https://gerrit.wikimedia.org/r/329684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Fix descriptionmsg of PermissionManager in extension.json

2016-12-31 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329757 )

Change subject: Fix descriptionmsg of PermissionManager in extension.json
..

Fix descriptionmsg of PermissionManager in extension.json

It was using a description of another extenstion

Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
---
M PermissionManager/extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/57/329757/1

diff --git a/PermissionManager/extension.json b/PermissionManager/extension.json
index 116bf6b..0995aa3 100644
--- a/PermissionManager/extension.json
+++ b/PermissionManager/extension.json
@@ -7,7 +7,7 @@
"Markus Glaser",
"Stephan Muggli"
],
-   "descriptionmsg": "bs-articleinfo-desc",
+   "descriptionmsg": "bs-permissionmanager-desc",
"type": "bluespice",
"bsgExtensions": {
"PermissionManager": {

-- 
To view, visit https://gerrit.wikimedia.org/r/329757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b363b8d48a9cf1c62c497478432811f88f0f658
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Replace deprecated attribute "width" with CSS "width" property

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329701 )

Change subject: Replace deprecated attribute "width" with CSS "width" property
..


Replace deprecated attribute "width" with CSS "width" property

The width attribute is deprecated in HTML5. It should use the CSS width 
property instead. For example, width='100%' should be replaced with 
style="width: 100%;".

Bug: T42211
Change-Id: I34f7819b0615e951c0f433cfbbaff5bcc32784b0
---
M frontend/FlaggablePageView.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Fomafix: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 64941ec..610fcaa 100755
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -828,15 +828,15 @@
$multiNotice . "";
}
return
-   "" .
+   "" .
"" .
"" .
"" .
"" .
"" .
-   "" .
+   "" .
$leftStatus . "" .
-   "" .
+   "" .
$rightStatus . "" .
"" .
$multiNotice .
@@ -1612,13 +1612,13 @@
if ( $oldRev && $newRev ) {
list( $msg, $class ) = self::getDiffRevMsgAndClass( 
$oldRev, $srev );
$table .= "";
-   $table .= "";
+   $table .= "";
// @todo i18n FIXME: Hard coded brackets
$table .= "[" .
wfMessage( $msg )->escaped() . "]";
 
list( $msg, $class ) = self::getDiffRevMsgAndClass( 
$newRev, $srev );
-   $table .= "";
+   $table .= "";
// @todo i18n FIXME: Hard coded brackets
$table .= "[" .
wfMessage( $msg )->escaped() . "]";

-- 
To view, visit https://gerrit.wikimedia.org/r/329701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I34f7819b0615e951c0f433cfbbaff5bcc32784b0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: isbn.py: convertIsbn10toIsbn13 should not fail for ISBN13

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/323676 )

Change subject: isbn.py: convertIsbn10toIsbn13 should not fail for ISBN13
..


isbn.py: convertIsbn10toIsbn13 should not fail for ISBN13

ISBN13 objects don't have a toISBN13 method, do not try to call that method
on ISBN13 objects.

The patch was originally introduced in a8008a210585759ac46f962eb2d6bd1ebad0460c
by Aadith1996, but reverted to fix minor issues.

Bug: T138911
Change-Id: I47118f6aa18cb659d1f9f96cdab93615e24af07b
---
M scripts/isbn.py
M tests/isbn_tests.py
2 files changed, 10 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Whym: Looks good to me, approved



diff --git a/scripts/isbn.py b/scripts/isbn.py
index f1e1a4b..cfd1fbb 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -1466,7 +1466,11 @@
 except InvalidIsbnException:
 # don't change
 return isbn
-i13 = getIsbn(isbn).toISBN13()
+i1x = getIsbn(isbn)
+if not isinstance(i1x, ISBN13):
+i13 = i1x.toISBN13()
+else:
+i13 = i1x
 return i13.code
 
 
diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py
index 701c50d..da97687 100644
--- a/tests/isbn_tests.py
+++ b/tests/isbn_tests.py
@@ -138,6 +138,11 @@
  'ISBN 978-0-9752298-0-4')
 self.assertEqual(convertIsbn10toIsbn13('ISBN 0-9752298-0-1'),
  'ISBN 0-9752298-0-1')  # Invalid ISBN - no changes
+# Should not fail for ISBN13
+self.assertEqual(
+convertIsbn10toIsbn13('ISBN 978-0-7869-3669-4'),
+'ISBN 978-0-7869-3669-4'
+)
 
 # Errors
 isbn = ISBN10('9492098059')

-- 
To view, visit https://gerrit.wikimedia.org/r/323676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I47118f6aa18cb659d1f9f96cdab93615e24af07b
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: Aadith1996 <96aad...@gmail.com>
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Whym 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve strings for the contentmodel log

2016-12-31 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329730 )

Change subject: Improve strings for the contentmodel log
..


Improve strings for the contentmodel log

Consistent terminology ("content model" not "contentmodel" or
"Contentmodel"; "change" not "modification"; "non-default" not
"non-standard") and clearer wording.

Change-Id: Ia24f30713588a35d077f52e6b25f59cd8b1c7c2f
---
M languages/i18n/en.json
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 02831fc..2d7a53e 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2191,7 +2191,7 @@
"changecontentmodel-emptymodels-title": "No content models available",
"changecontentmodel-emptymodels-text": "The content on [[:$1]] cannot 
be converted to any type.",
"log-name-contentmodel": "Content model change log",
-   "log-description-contentmodel": "Events related to the content models 
of a page",
+   "log-description-contentmodel": "This page lists changes to the content 
model of pages, and pages that were created with a content model other than the 
default.",
"logentry-contentmodel-new": "$1 {{GENDER:$2|created}} the page $3 
using a non-default content model \"$5\"",
"logentry-contentmodel-change": "$1 {{GENDER:$2|changed}} the content 
model of the page $3 from \"$4\" to \"$5\"",
"logentry-contentmodel-change-revertlink": "revert",
@@ -4124,7 +4124,7 @@
"sessionprovider-nocookies": "Cookies may be disabled. Ensure you have 
cookies enabled and start again.",
"randomrootpage": "Random root page",
"log-action-filter-block": "Type of block:",
-   "log-action-filter-contentmodel": "Type of contentmodel modification:",
+   "log-action-filter-contentmodel": "Type of content model change:",
"log-action-filter-delete": "Type of deletion:",
"log-action-filter-import": "Type of import:",
"log-action-filter-managetags": "Type of tag management action:",
@@ -4139,8 +4139,8 @@
"log-action-filter-block-block": "Block",
"log-action-filter-block-reblock": "Block modification",
"log-action-filter-block-unblock": "Unblock",
-   "log-action-filter-contentmodel-change": "Change of Contentmodel",
-   "log-action-filter-contentmodel-new": "Creation of page with 
non-standard Contentmodel",
+   "log-action-filter-contentmodel-change": "Change of content model",
+   "log-action-filter-contentmodel-new": "Creation of page with 
non-default content model",
"log-action-filter-delete-delete": "Page deletion",
"log-action-filter-delete-delete_redir": "Redirect overwrite",
"log-action-filter-delete-restore": "Page undeletion",

-- 
To view, visit https://gerrit.wikimedia.org/r/329730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia24f30713588a35d077f52e6b25f59cd8b1c7c2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

97 matches

Mail list logo