date:20161217

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP

2016-12-17 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328031 )

Change subject: WIP
..

WIP

Bug: T150726
Change-Id: I6e06e9e2e4c4be5b3f6555c22c0bb36181675318
---
M modules/role/manifests/toollabs/services.pp
1 file changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/328031/1

diff --git a/modules/role/manifests/toollabs/services.pp 
b/modules/role/manifests/toollabs/services.pp
index 7b76a1d..f521b92 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -16,14 +16,15 @@
 mode   => '0770',
 }
 
-file { "/data/project/.system/aptly/${::fqdn}":
-ensure=> directory,
-source=> '/srv/packages',
-owner => 'root',
-group => "${::labsproject}.admin",
-mode  => '0440',
-recurse   => true,
-show_diff => false,
+# TODO: It would look nicer not to subscribe to the Execs but the
+# defined type, if the Exec triggers the defined type.  Needs to
+# be tested.
+exec { 'backup_aptly_packages':
+command   => "/usr/bin/rsync --chmod 440 --chown 
root:${::labsproject}.admin -ilrt /srv/packages/ 
/data/project/.system/aptly/${::fqdn}",
+subscribe => Exec["publish-aptly-repo-jessie-${::labsproject}",
+  "publish-aptly-repo-precise-${::labsproject}",
+  "publish-aptly-repo-trusty-${::labsproject}"],
+logoutput => true,
 }
 
 class { '::toollabs::services':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e06e9e2e4c4be5b3f6555c22c0bb36181675318
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Generate node sets dynamically

2016-12-17 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328030 )

Change subject: Tools: Generate node sets dynamically
..

Tools: Generate node sets dynamically

Currently, the list of nodes per hostgroup is regenerated every
minute.  This is far more often than clush is actually used according
to the log file, and additionally this two-step process can result in
confusing behaviour in cases where the cron job fails in some way.

This change generates the node sets dynamically, on demand.  Thus they
are always up-to-date and errors in generating the list make
themselves known immediately.  Technically, the generated "load" on
wikitech will be reduced, but given the low frequency of API calls
(once per clush invocation) this is not a factor.

Change-Id: I5bb630836beb1c6a2aa2b346bef03687db9f4732
---
D modules/role/files/toollabs/clush/tools-clush-generator
A modules/role/files/toollabs/clush/tools-clush-generator.py
D modules/role/files/toollabs/clush/tools-clush-interpreter
M modules/role/manifests/toollabs/clush/master.pp
4 files changed, 108 insertions(+), 131 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/328030/1

diff --git a/modules/role/files/toollabs/clush/tools-clush-generator 
b/modules/role/files/toollabs/clush/tools-clush-generator
deleted file mode 100644
index 2b8f7cb..000
--- a/modules/role/files/toollabs/clush/tools-clush-generator
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/python3
-"""
-Simple script that generates a YAML file classifying all instances
-on the tools project into groups based on the role they perform.
-
-This YAML file can then be read by `tools-clush-interpreter` to
-list instances within a group. This can be used by `clush` to
-allow arbitrary command execution on targeted list of instances.
-
-This is run in a cron every hour.
-"""
-import json
-import yaml
-import argparse
-from urllib.request import urlopen
-
-
-# Maps prefixes to hostgroup names
-TOOLS_PREFIX_CLASSIFIER = {
-'webgrid-lighttpd-12': 'webgrid-lighttpd-precise',
-'webgrid-lighttpd-14': 'webgrid-lighttpd-trusty',
-'webgrid-generic': 'webgrid-generic',
-'webgrid-': 'webgrid',
-'exec-': 'exec',
-'exec-12': 'exec-precise',
-'exec-14': 'exec-trusty',
-'proxy-': 'webproxy',
-'checker-': 'checker',
-'redis-': 'redis',
-'services-': 'services',
-'bastion-': 'bastion',
-'cron-': 'cron',
-'grid-master': 'grid-master',
-'grid-shadow': 'grid-shadow',
-'mail': 'mail',
-'static-': 'static',
-'worker': 'k8s-worker',
-'k8s-master': 'k8s-master',
-'flannel-etcd': 'flannel-etcd',
-'k8s-etcd': 'k8s-etcd',
-'logs': 'logs',
-'precise-dev': 'precise-dev',
-'docker-builder': 'docker-builder',
-'prometheus': 'prometheus',
-'': 'all',
-}
-
-
-def get_hostgroups(classifier, project_name):
-hostgroups = {name: [] for name in classifier.values()}
-
-api_url = 'https://wikitech.wikimedia.org/w/api.php' \
-'?action=query=novainstances=eqiad=json' \
-'=' + project_name
-
-data = json.loads(urlopen(api_url).read().decode('utf-8'))
-
-for instance in data['query']['novainstances']:
-name = instance['name']
-for prefix in classifier:
-if name.startswith('%s-%s' % (project_name, prefix)):
-role = classifier[prefix]
-hostgroups[role].append('%s.%s.eqiad.wmflabs' % (name, 
project_name))
-
-return hostgroups
-
-
-if __name__ == '__main__':
-parser = argparse.ArgumentParser()
-parser.add_argument(
-'outputpath',
-help='Path to output hostgroup to host mappings'
-)
-args = parser.parse_args()
-
-with open('/etc/wmflabs-project', 'r') as f:
-project_name = f.read().rstrip('\n')
-
-hostgroups = get_hostgroups(TOOLS_PREFIX_CLASSIFIER, project_name)
-with open(args.outputpath, 'w') as f:
-f.write(yaml.safe_dump(hostgroups, default_flow_style=False))
diff --git a/modules/role/files/toollabs/clush/tools-clush-generator.py 
b/modules/role/files/toollabs/clush/tools-clush-generator.py
new file mode 100644
index 000..15b54c4
--- /dev/null
+++ b/modules/role/files/toollabs/clush/tools-clush-generator.py
@@ -0,0 +1,95 @@
+#!/usr/bin/python3
+
+
+"""Simple generator script for clustershell to dynamically list all
+   instances and classify them into groups based on their hostname.
+
+"""
+
+
+import argparse
+import json
+import urllib.request
+
+
+# Maps hostgroup names to prefixes.
+TOOLS_HOSTGROUPS = {
+'all': '',
+'bastion': 'bastion-',
+'checker': 'checker-',
+'cron': 'cron-',
+'docker-builder': 'docker-builder',
+'exec': 'exec-',
+'exec-precise': 'exec-12',
+'exec-trusty': 'exec-14',
+'flannel-etcd': 'flannel-etcd',
+'grid-master': 'grid-master',
+'grid-shadow': 'grid-shadow',
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Also allow opening in source mode if VE is unavailable on ac...

2016-12-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328029 )

Change subject: Also allow opening in source mode if VE is unavailable on 
action=edit
..

Also allow opening in source mode if VE is unavailable on action=edit

Bug: T153508
Change-Id: I5678d3b417c93707edc90bbb76ce4dafcd2098c6
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 4 insertions(+), 0 deletions(-)


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

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..5d7a7c4 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
@@ -910,6 +910,10 @@
(

tabPreference === 'remember-last' &&

getLastEditor() === 'wikitext'
+   ) ||
+   (
+   
!init.isVisualAvailable &&
+   [ 
'edit', 'submit' ].indexOf( uri.query.action ) !== -1
)
)
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5678d3b417c93707edc90bbb76ce4dafcd2098c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add dotall modifier to EDITSECTION_REGEX

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

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

Change subject: Add dotall modifier to EDITSECTION_REGEX
..


Add dotall modifier to EDITSECTION_REGEX

The regex failed to match for input text like

==
==

resulting in  tags being leaked into the output.

Change-Id: I3daade920d2de8cd3fc31fcaabf46ffe14b047d5
---
M includes/parser/ParserOutput.php
M tests/parser/parserTests.txt
2 files changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 9dfa97c..e9cdfcf 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -213,7 +213,7 @@
private $mMaxAdaptiveExpiry = INF;
 
const EDITSECTION_REGEX =
-   '#<(?:mw:)?editsection page="(.*?)" 
section="(.*?)"(?:/>|>(.*?)())#';
+   '#<(?:mw:)?editsection page="(.*?)" 
section="(.*?)"(?:/>|>(.*?)())#s';
 
// finalizeAdaptiveCacheExpiry() uses TTL = MAX( m * PARSE_TIME + b, 
MIN_AR_TTL)
// Current values imply that m=3933.33 and b=-333.33
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ba7b0d4..e12bc03 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -514,6 +514,17 @@
 !! end
 
 !! test
+Heading with line break in nowiki
+!! wikitext
+== A B
+C ==
+!! html
+A B
+C[edit]
+
+!! end
+
+!! test
 Parsing an URL
 !! wikitext
 http://fr.wikipedia.org/wiki/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3daade920d2de8cd3fc31fcaabf46ffe14b047d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
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...Echo[master]: Get undone revision id from hook param instead of request

2016-12-17 Thread Cenarium (Code Review)

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

Change subject: Get undone revision id from hook param instead of request
..

Get undone revision id from hook param instead of request

The PageContentSaveComplete hook is now inside a deferred update, so
when using the API, 'wpUndidRevision' is no longer present in the
request. This gets the undone rev id from a new param added to the hook.

Bug:T153567
Change-Id: Id539a7db8d8f5e902177845bd212b4d6c2500f89
Depends-On: I50dcb841cd0616acc2d69c3a685ba3cb339986c3
---
M Hooks.php
1 file changed, 22 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/28/328028/1

diff --git a/Hooks.php b/Hooks.php
index 0c6717c..989c3e7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -469,10 +469,13 @@
 * @param $flags int Edit flags
 * @param $revision Revision that was created
 * @param $status Status
+* @param $baseRevId Int
+* @param $undidRevId Int
 * @return bool true in all cases
 */
-   public static function onPageContentSaveComplete( &$article, &$user, 
$content, $summary, $minoredit, $watchthis, $sectionanchor, &$flags, $revision, 
&$status ) {
-   global $wgEchoNotifications, $wgRequest;
+   public static function onPageContentSaveComplete( &$article, &$user, 
$content, $summary, $minoredit,
+   $watchthis, $sectionanchor, &$flags, $revision, &$status, 
$baseRevId, $undidRevId ) {
+   global $wgEchoNotifications;
 
if ( !$revision ) {
return true;
@@ -533,26 +536,23 @@
 
// Handle the case of someone undoing an edit, either through 
the
// 'undo' link in the article history or via the API.
-   if ( isset( $wgEchoNotifications['reverted'] ) ) {
-   $undidRevId = $wgRequest->getVal( 'wpUndidRevision' );
-   if ( $undidRevId ) {
-   $undidRevision = Revision::newFromId( 
$undidRevId );
-   if ( $undidRevision && 
$undidRevision->getTitle()->equals( $title ) ) {
-   $victimId = $undidRevision->getUser();
-   if ( $victimId ) { // No notifications 
for anonymous users
-   EchoEvent::create( array(
-   'type' => 'reverted',
-   'title' => $title,
-   'extra' => array(
-   'revid' => 
$revision->getId(),
-   
'reverted-user-id' => $victimId,
-   
'reverted-revision-id' => $undidRevId,
-   'method' => 
'undo',
-   'summary' => 
$summary,
-   ),
-   'agent' => $user,
-   ) );
-   }
+   if ( isset( $wgEchoNotifications['reverted'] ) && $undidRevId ) 
{
+   $undidRevision = Revision::newFromId( $undidRevId );
+   if ( $undidRevision && 
$undidRevision->getTitle()->equals( $title ) ) {
+   $victimId = $undidRevision->getUser();
+   if ( $victimId ) { // No notifications for 
anonymous users
+   EchoEvent::create( array(
+   'type' => 'reverted',
+   'title' => $title,
+   'extra' => array(
+   'revid' => 
$revision->getId(),
+   'reverted-user-id' => 
$victimId,
+   'reverted-revision-id' 
=> $undidRevId,
+   'method' => 'undo',
+   'summary' => $summary,
+   ),
+   'agent' => $user,
+   ) );
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Pass undone revision id to PageContentSaveComplete hook

2016-12-17 Thread Cenarium (Code Review)

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

Change subject: Pass undone revision id to PageContentSaveComplete hook
..

Pass undone revision id to PageContentSaveComplete hook

This passes the id of the revision that was undone to the
PageContentSaveComplete hook, since this hook is now inside a deferred
update so extensions can no longer rely on 'wpUndidRevision' being
present in the request.

Change-Id: I50dcb841cd0616acc2d69c3a685ba3cb339986c3
---
M includes/EditPage.php
M includes/page/WikiPage.php
2 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/328027/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f37ce34..0ccd052 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2142,7 +2142,8 @@
false,
$wgUser,
$content->getDefaultFormat(),
-   $this->changeTags
+   $this->changeTags,
+   $this->undidRev
);
 
if ( !$doEditStatus->isOK() ) {
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 924a395..957520d 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1634,6 +1634,7 @@
 * @param array|null $tags Change tags to apply to this edit
 * Callers are responsible for permission checks
 * (with ChangeTags::canAddTagsAccompanyingChange)
+* @param Int $undidRevId Id of revision that was undone or 0
 *
 * @throws MWException
 * @return Status Possible errors:
@@ -1655,7 +1656,7 @@
 */
public function doEditContent(
Content $content, $summary, $flags = 0, $baseRevId = false,
-   User $user = null, $serialFormat = null, $tags = []
+   User $user = null, $serialFormat = null, $tags = [], 
$undidRevId = 0
) {
global $wgUser, $wgUseAutomaticEditSummaries;
 
@@ -1734,7 +1735,8 @@
'oldId' => $this->getLatest(),
'oldIsRedirect' => $this->isRedirect(),
'oldCountable' => $this->isCountable(),
-   'tags' => ( $tags !== null ) ? (array)$tags : []
+   'tags' => ( $tags !== null ) ? (array)$tags : [],
+   'undidRevId' => $undidRevId
];
 
// Actually create the revision and create/update the page
@@ -1914,7 +1916,8 @@
);
// Trigger post-save hook
$params = [ &$this, &$user, $content, 
$summary, $flags & EDIT_MINOR,
-   null, null, &$flags, $revision, 
&$status, $meta['baseRevId'] ];
+   null, null, &$flags, $revision, 
&$status, $meta['baseRevId'],
+   $meta['undidRevId'] ];
ContentHandler::runLegacyHooks( 
'ArticleSaveComplete', $params );
Hooks::run( 'PageContentSaveComplete', 
$params );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Move various classes to their own files

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

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

Change subject: Move various classes to their own files
..


Move various classes to their own files

Change-Id: I5d418b3fa27aa6e04b9a680922e5eab2439ffb20
---
D AbuseFilter.parser.new.php
M extension.json
R includes/AFComputedVariable.php
R includes/AbuseFilter.class.php
R includes/AbuseFilterPreAuthenticationProvider.php
R includes/AbuseLogHitFormatter.php
A includes/parser/AFPData.php
A includes/parser/AFPException.php
A includes/parser/AFPParserState.php
A includes/parser/AFPToken.php
A includes/parser/AFPTreeNode.php
A includes/parser/AFPTreeParser.php
A includes/parser/AFPUserVisibleException.php
A includes/parser/AbuseFilterCachingParser.php
R includes/parser/AbuseFilterParser.php
R includes/parser/AbuseFilterTokenizer.php
A includes/parser/AbuseFilterVariableHolder.php
17 files changed, 1,833 insertions(+), 1,825 deletions(-)

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



diff --git a/AbuseFilter.parser.new.php b/AbuseFilter.parser.new.php
deleted file mode 100644
index af7911a..000
--- a/AbuseFilter.parser.new.php
+++ /dev/null
@@ -1,1014 +0,0 @@
-type = $type;
-   $this->children = $children;
-   $this->position = $position;
-   }
-
-   public function toDebugString() {
-   return implode( "\n", $this->toDebugStringInner() );
-   }
-
-   private function toDebugStringInner() {
-   if ( $this->type == self::ATOM ) {
-   return [ "ATOM({$this->children->type} 
{$this->children->value})" ];
-   }
-
-   $align = function ( $line ) {
-   return '  ' . $line;
-   };
-
-   $lines = [ "{$this->type}" ];
-   foreach ( $this->children as $subnode ) {
-   if ( $subnode instanceof AFPTreeNode ) {
-   $sublines = array_map( $align, 
$subnode->toDebugStringInner() );
-   } elseif ( is_string( $subnode ) ) {
-   $sublines = [ "  {$subnode}" ];
-   } else {
-   throw new AFPException( "Each node parameter 
has to be either a node or a string" );
-   }
-
-   $lines = array_merge( $lines, $sublines );
-   }
-   return $lines;
-   }
-}
-
-/**
- * A parser that transforms the text of the filter into a parse tree.
- */
-class AFPTreeParser {
-   // The tokenized representation of the filter parsed.
-   public $mTokens;
-
-   // Current token handled by the parser and its position.
-   public $mCur, $mPos;
-
-   const CACHE_VERSION = 2;
-
-   /**
-* Create a new instance
-*/
-   public function __construct() {
-   $this->resetState();
-   }
-
-   public function resetState() {
-   $this->mTokens = array();
-   $this->mPos = 0;
-   }
-
-   /**
-* Advances the parser to the next token in the filter code.
-*/
-   protected function move() {
-   list( $this->mCur, $this->mPos ) = $this->mTokens[$this->mPos];
-   }
-
-   /**
-* getState() function allows parser state to be rollbacked to several 
tokens
-* back.
-*
-* @return AFPParserState
-*/
-   protected function getState() {
-   return new AFPParserState( $this->mCur, $this->mPos );
-   }
-
-   /**
-* setState() function allows parser state to be rollbacked to several 
tokens
-* back.
-*
-* @param AFPParserState $state
-*/
-   protected function setState( AFPParserState $state ) {
-   $this->mCur = $state->token;
-   $this->mPos = $state->pos;
-   }
-
-   /**
-* Parse the supplied filter source code into a tree.
-*
-* @param string $code
-* @throws AFPUserVisibleException
-* @return AFPTreeNode|null
-*/
-   public function parse( $code ) {
-   $this->mTokens = AbuseFilterTokenizer::tokenize( $code );
-   $this->mPos = 0;
-
-   return $this->doLevelEntry();
-   }
-
-   /* Levels */
-
-   /**
-* Handles unexpected characters after the expression.
-* @return AFPTreeNode|null
-* @throws AFPUserVisibleException
-*/
-   protected function doLevelEntry() {
-   $result = $this->doLevelSemicolon();
-
-   if ( $this->mCur->type != AFPToken::TNONE ) {
-   throw new AFPUserVisibleException(
-   'unexpectedatend',
-   $this->mPos, [ $this->mCur->type ]
-   );
-   }
-
-

[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace "Article::getContent()" deprecated in MediaWiki 1.21

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

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

Change subject: Replace "Article::getContent()" deprecated in MediaWiki 1.21
..


Replace "Article::getContent()" deprecated in MediaWiki 1.21

* LinkPage

Bug: T151973
Change-Id: I0f32201d1ada9b61823a239bf881e9817a05ab88
---
M LinkPage.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/LinkPage.php b/LinkPage.php
index bd5f191..f56874a 100644
--- a/LinkPage.php
+++ b/LinkPage.php
@@ -30,18 +30,18 @@
 
function setContent() {
// Get the page content for later use
-   $this->pageContent = $this->getContent();
+   $this->pageContent = ContentHandler::getContentText( 
$this->getContentObject() );
 
// If its a redirect, in order to get the *real* content for 
later use,
// we have to load the text for the real page
// Note: If $this->getContent is called anywhere before 
parent::view,
// the real article text won't get loaded on the page
-   if ( $this->isRedirect( $this->pageContent ) ) {
+   if ( $this->isRedirect() ) {
wfDebugLog( 'LinkFilter', __METHOD__ . "\n" );
 
$target = $this->followRedirect();
-   $rarticle = new Article( $target );
-   $this->pageContent = $rarticle->getContent();
+   $page = WikiPage::factory( $target );
+   $this->pageContent = ContentHandler::getContentText( 
$page->getContent() );
 
// if we don't clear, the page content will be 
[[redirect-blah]],
// and not actual page

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f32201d1ada9b61823a239bf881e9817a05ab88
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: 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] pywikibot/core[master]: PetScan page generator

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

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

Change subject: PetScan page generator
..


PetScan page generator

Bug: T60814
Change-Id: I23044630a34c7cc4645524b0291448a338e2f176
---
M pywikibot/pagegenerators.py
M tests/pagegenerators_tests.py
2 files changed, 120 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index eafd14b..3db16a7 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -27,6 +27,7 @@
 import codecs
 import datetime
 import itertools
+import json
 import re
 import sys
 import time
@@ -46,12 +47,21 @@
 intersect_generators,
 IteratorNextMixin,
 filter_unique,
+PY2,
 )
 
 from pywikibot import date, config, i18n, xmlreader
+from pywikibot.comms import http
 from pywikibot.exceptions import ArgumentDeprecationWarning, UnknownExtension
 from pywikibot.logentries import LogEntryFactory
 from pywikibot.proofreadpage import ProofreadPage
+
+if PY2:
+from urllib import urlencode
+import urlparse
+else:
+import urllib.parse as urlparse
+from urllib.parse import urlencode
 
 if sys.version_info[0] > 2:
 basestring = (str, )
@@ -2764,6 +2774,92 @@
 yield pywikibot.ItemPage(repo, item['id'])
 
 
+class PetScanPageGenerator(object):
+"""Queries PetScan (https://petscan.wmflabs.org/) to generate pages."""
+
+def __init__(self, categories, subset_combination=True, namespaces=None,
+ site=None, extra_options=None):
+"""
+Constructor.
+
+:param categories: List of categories to retrieve pages from
+(as strings)
+:param subset_combination: Combination mode.
+If True, returns the intersection of the results of the categories,
+else returns the union of the results of the categories
+:param namespaces: List of namespaces to search in
+(default is None, meaning all namespaces)
+:param site: Site to operate on
+(default is the default site from the user config)
+:param extra_options: Dictionary of extra options to use (optional)
+"""
+if site is None:
+site = pywikibot.Site()
+
+self.site = site
+self.opts = self.buildQuery(categories, subset_combination,
+namespaces, extra_options)
+
+def buildQuery(self, categories, subset_combination, namespaces,
+   extra_options):
+"""
+Get the querystring options to query PetScan.
+
+:param categories: List of categories (as strings)
+:param subset_combination: Combination mode.
+If True, returns the intersection of the results of the categories,
+else returns the union of the results of the categories
+:param namespaces: List of namespaces to search in
+:param extra_options: Dictionary of extra options to use
+:return: Dictionary of querystring parameters to use in the query
+"""
+extra_options = extra_options or {}
+
+query = {
+'language': self.site.lang,
+'project': self.site.family,
+'combination': 'subset' if subset_combination else 'union',
+'categories': '\r\n'.join(categories),
+'format': 'json',
+'doit': ''
+}
+
+# test wikipedia
+if self.site.code == 'test' and self.site.family == 'test':
+query['language'] = 'test'
+query['project'] = 'wikipedia'
+
+if namespaces:
+for namespace in namespaces:
+query['ns[{0}]'.format(int(namespace))] = 1
+
+query_final = query.copy()
+query_final.update(extra_options)
+
+return query_final
+
+def query(self):
+"""Query PetScan."""
+url = urlparse.urlunparse(('https',   # scheme
+   'petscan.wmflabs.org', # netloc
+   '',# path
+   '',# params
+   urlencode(self.opts),  # query
+   ''))   # fragment
+
+req = http.fetch(url)
+j = json.loads(req.content)
+raw_pages = j['*'][0]['a']['*']
+for raw_page in raw_pages:
+yield raw_page
+
+def __iter__(self):
+for raw_page in self.query():
+page = pywikibot.Page(self.site, raw_page['title'],
+  int(raw_page['namespace']))
+yield page
+
+
 # Deprecated old names available for compatibility with compat.
 ImageGenerator = redirect_func(FileGenerator,

[MediaWiki-commits] [Gerrit] mediawiki...Wikilog[master]: Removed usages of a deprecated method: Revision::getText

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

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

Change subject: Removed usages of a deprecated method: Revision::getText
..


Removed usages of a deprecated method: Revision::getText

Bug: T151973
Change-Id: Ice23dbd7f06a8ccdc7b555097153da2b3e94928b
---
M WikilogComment.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/WikilogComment.php b/WikilogComment.php
index 41db768..9ca271b 100644
--- a/WikilogComment.php
+++ b/WikilogComment.php
@@ -148,7 +148,7 @@
$dbr = wfGetDB( DB_SLAVE );
$rev = Revision::loadFromId( $dbr, $this->mCommentRev );
if ( $rev ) {
-   $this->mText = $rev->getText();
+   $this->mText = ContentHandler::getContentText( 
$rev->getContent() );
$this->mTextChanged = false;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice23dbd7f06a8ccdc7b555097153da2b3e94928b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikilog
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: LukBukkit 
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...LinkFilter[master]: LinkFilter missing api i18n messages

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

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

Change subject: LinkFilter missing api i18n messages
..


LinkFilter missing api i18n messages

Adds following missing api i18n messages:
* apihelp-linkfilter-description
* apihelp-linkfilter-param-id
* apihelp-linkfilter-param-status
* apihelp-linkfilter-example-1

Bug: T153238
Change-Id: I467bd9f2e2219f4792493895f467e06c74825591
---
M ApiLinkFilter.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 20 insertions(+), 28 deletions(-)

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



diff --git a/ApiLinkFilter.php b/ApiLinkFilter.php
index bc05091..94451c6 100644
--- a/ApiLinkFilter.php
+++ b/ApiLinkFilter.php
@@ -72,13 +72,6 @@
}
 
/**
-* @return String: human-readable module description
-*/
-   public function getDescription() {
-   return 'Backend API module for approving user-submitted links';
-   }
-
-   /**
 * @return Array
 */
public function getAllowedParams() {
@@ -95,23 +88,12 @@
}
 
/**
-* Describe the parameters
-* @return Array
+* @see ApiBase::getExamplesMessages()
 */
-   public function getParamDescription() {
-   return array_merge( parent::getParamDescription(), array(
-   'id' => 'Link identifier number',
-   'status' => '1 to accept, 2 to reject'
-   ) );
-   }
-
-   /**
-* Get examples
-* @return Array
-*/
-   public function getExamples() {
+   public function getExamplesMessages() {
return array(
-   'api.php?action=linkfilter=37=2' => 'Rejects 
the link #37'
+   'action=linkfilter=37=2'
+   => 'apihelp-linkfilter-example-1'
);
}
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index 540c9aa..b3814d2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"Aaron Wright ",
-   "David Pean "
+   "David Pean ",
+   "David Sn "
]
},
"linkapprove": "Approve links",
@@ -68,5 +69,9 @@
"grouppage-linkadmin": "{{ns:project}}:Link administrators",
"right-linkadmin": "Administrate user-submitted links",
"group-linkadmin.css": "/* CSS placed here will affect linkadmins only 
*/",
-   "group-linkadmin.js": "/* JS placed here will affect linkadmins only */"
-}
\ No newline at end of file
+   "group-linkadmin.js": "/* JS placed here will affect linkadmins only 
*/",
+   "apihelp-linkfilter-description": "Backend API module for approving 
user-submitted links",
+   "apihelp-linkfilter-param-id": "Link identifier number",
+   "apihelp-linkfilter-param-status": "1 to accept, 2 to reject",
+   "apihelp-linkfilter-example-1": "Rejects the link #37"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e7ad083..0b756ea 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,7 +4,8 @@
"Darth Kule",
"Shirayuki",
"Umherirrender",
-   "Liuxinyu970226"
+   "Liuxinyu970226",
+   "Divadsn"
]
},
"linkapprove": "{{doc-special|LinkApprove}}",
@@ -70,5 +71,9 @@
"grouppage-linkadmin": "{{doc-group|linkadmin|page}}",
"right-linkadmin": "{{doc-right|linkadmin}}",
"group-linkadmin.css": "{{doc-group|linkadmin|css}}",
-   "group-linkadmin.js": "{{doc-group|linkadmin|js}}"
+   "group-linkadmin.js": "{{doc-group|linkadmin|js}}",
+   "apihelp-linkfilter-description": 
"{{doc-apihelp-description|linkfilter}}",
+   "apihelp-linkfilter-param-id": "{{doc-apihelp-param|linkfilter|id}}",
+   "apihelp-linkfilter-param-status": 
"{{doc-apihelp-param|linkfilter|status}}",
+   "apihelp-linkfilter-example-1": "{{doc-apihelp-example|linkfilter}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I467bd9f2e2219f4792493895f467e06c74825591
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki...SphinxSearch[master]: Fix for incategory prefix to work in 1.25: Needs to inherit ...

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

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

Change subject: Fix for incategory prefix to work in 1.25: Needs to inherit 
from SearchDatabase for DB queries.
..


Fix for incategory prefix to work in 1.25:
Needs to inherit from SearchDatabase for DB queries.

Bug: T17

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

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



diff --git a/SphinxMWSearch.php b/SphinxMWSearch.php
index 4aea2b6..8ece3a2 100644
--- a/SphinxMWSearch.php
+++ b/SphinxMWSearch.php
@@ -12,7 +12,7 @@
  * @author Svemir Brkic 
  */
 
-class SphinxMWSearch extends SearchEngine {
+class SphinxMWSearch extends SearchDatabase {
 
public $categories = array();
public $exc_categories = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I753a07140ce49e5e8eb8a4acaf94fdd0898e2663
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SphinxSearch
Gerrit-Branch: master
Gerrit-Owner: Rglasnap 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Platonides 
Gerrit-Reviewer: Svemir Brkic 
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/debian[master]: Update changelog to indicate #848441 is also fixed

2016-12-17 Thread Legoktm (Code Review)

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

Change subject: Update changelog to indicate #848441 is also fixed
..


Update changelog to indicate #848441 is also fixed

Change-Id: If6e37dd23403b9aa62ff7ec2350de6ea035488b2
---
M debian/changelog
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 768004e..82bdcf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@
   * Add README for mediawiki-classes
   * Add RELEASE-NOTES-* as documentation for mediawiki
   * Recommend default-mysql-server | virtual-mysql-server instead of
-just mysql-server (Closes: #843994)
+just mysql-server (Closes: #843994, #848441)
   * Use bundled jQuery (version 1) instead of Debian's jQuery, which is
 now the incompatible version 3
   * Add Provides for extensions now included in this one (Closes: #845281)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6e37dd23403b9aa62ff7ec2350de6ea035488b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
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/debian[master]: Update changelog to indicate #848441 is also fixed

2016-12-17 Thread Legoktm (Code Review)

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

Change subject: Update changelog to indicate #848441 is also fixed
..

Update changelog to indicate #848441 is also fixed

Change-Id: If6e37dd23403b9aa62ff7ec2350de6ea035488b2
---
M debian/changelog
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/26/328026/1

diff --git a/debian/changelog b/debian/changelog
index 768004e..82bdcf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@
   * Add README for mediawiki-classes
   * Add RELEASE-NOTES-* as documentation for mediawiki
   * Recommend default-mysql-server | virtual-mysql-server instead of
-just mysql-server (Closes: #843994)
+just mysql-server (Closes: #843994, #848441)
   * Use bundled jQuery (version 1) instead of Debian's jQuery, which is
 now the incompatible version 3
   * Add Provides for extensions now included in this one (Closes: #845281)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6e37dd23403b9aa62ff7ec2350de6ea035488b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
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] labs...grrrit[master]: Remove grrrit-wm: force-restart

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Remove grrrit-wm: force-restart
..

Remove grrrit-wm: force-restart

Make force-restart an alias to restart

the only difference is now the bot will not disconnect from irc and ssh and 
reconnect. It will now only disconnect and reconnect to ssh.

Change-Id: I3dd6ecfe945c7532d4e288f1e505197baa4a4a84
grrrit-wm: nick should change the nick back to the original nick if not taken.
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/25/328025/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dd6ecfe945c7532d4e288f1e505197baa4a4a84
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
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]: Removed usage of old SpecialPage code for viewing the page

2016-12-17 Thread Georggi199 (Code Review)

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

Change subject: Removed usage of old SpecialPage code for viewing the page
..

Removed usage of old SpecialPage code for viewing the page

Bug: T152678
Change-Id: Ic725e3767c213fe304063681b411dfe5da86143a
---
M includes/specials/SpecialNewsletter.php
1 file changed, 2 insertions(+), 130 deletions(-)


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

diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index dc5a760..640f21a 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -61,9 +61,8 @@
$this->doAnnounceExecute();
break;
default:
-   $this->doViewExecute();
-   $action = null;
-   break;
+   $this->getOutput()->redirect( 
Title::makeTitleSafe( NS_NEWSLETTER, $this->newsletter->getName() 
)->getFullURL() );
+   return;
}
 
$out->addSubtitle( $this->getNavigationLinks( $action ) 
);
@@ -181,94 +180,6 @@
}
 
/**
-* Build the main form for Special:Newsletter/$id. This is shown
-* by default when visiting Special:Newsletter/$id
-*/
-   protected function doViewExecute() {
-   $user = $this->getUser();
-   $this->getOutput()->setPageTitle( $this->msg( 'newsletter-view' 
) );
-
-   if ( $user->isLoggedIn() ) {
-   // buttons are only shown for logged-in users
-$html = $this->getNewsletterActionButtons();
-$this->getOutput()->addHTML( $html );
-   }
-
-   $publishers = UserArray::newFromIDs( 
$this->newsletter->getPublishers() );
-   $mainTitle = Title::newFromID( $this->newsletter->getPageId() );
-   $fields = array(
-   'mainpage' => array(
-   'type' => 'info',
-   'label-message' => 'newsletter-view-mainpage',
-   'default' => 
$this->getLinkRenderer()->makeLink( $mainTitle, $mainTitle->getPrefixedText() ),
-   'raw' => true,
-   ),
-   'description' => array(
-   'type' => 'info',
-   'label-message' => 
'newsletter-view-description',
-   'default' => 
$this->newsletter->getDescription(),
-   'rows' => 6,
-   'readonly' => true,
-   ),
-   'publishers' => array(
-   'type' => 'info',
-   'label' => $this->msg( 
'newsletter-view-publishers' )
-   ->numParams( count( $publishers ) )
-   ->text(),
-   ),
-   'subscribe' => array(
-   'type' => 'info',
-   'label-message' => 
'newsletter-view-subscriber-count',
-   'default' => $this->getLanguage()->formatNum( 
$this->newsletter->getSubscriberCount() ),
-   ),
-   );
-
-   if ( count( $publishers ) > 0 ) {
-   // Have this here to avoid calling unneeded functions
-   $this->doLinkCacheQuery( $publishers );
-   $fields['publishers']['default'] = 
$this->buildUserList( $publishers );
-   $fields['publishers']['raw'] = true;
-   } else {
-   // Show a message if there are no publishers instead of 
nothing
-   $fields['publishers']['default'] = $this->msg( 
'newsletter-view-no-publishers' )->escaped();
-   }
-
-   // Show the 10 most recent issues if there have been 
announcements
-   $logs = '';
-   $logCount = LogEventsList::showLogExtract(
-   $logs, // by reference
-   'newsletter',
-   $this->getPageTitle( $this->newsletter->getId() ),
-   '',
-   array(
-   'lim' => 10,
-   'showIfEmpty' => false,
-   'conds' => array( 'log_action' => 'issue-added' 
),
-   'extraUrlParams' => array( 'subtype' => 
'issue-added'

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Tests: Added to BlueSpice group

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

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

Change subject: Tests: Added to BlueSpice group
..


Tests: Added to BlueSpice group

Added tests to BlueSpice group for automated testing

Change-Id: I4b19d1fc398ad67964384b7f98b96bb7cbe12c3c
---
M tests/api/BSApiTitleQueryStoreTest.php
M tests/api/BSApiWikiPageTasksTest.php
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/tests/api/BSApiTitleQueryStoreTest.php 
b/tests/api/BSApiTitleQueryStoreTest.php
index b80840d..611783e 100644
--- a/tests/api/BSApiTitleQueryStoreTest.php
+++ b/tests/api/BSApiTitleQueryStoreTest.php
@@ -2,6 +2,10 @@
 
 /**
  * @group medium
+ * @group API
+ * @group Database
+ * @group BlueSpice
+ * @group BlueSpiceFoundation
  *
  * Class BSApiTitleQueryStoreTest
  */
diff --git a/tests/api/BSApiWikiPageTasksTest.php 
b/tests/api/BSApiWikiPageTasksTest.php
index 122da1c..e93429f 100644
--- a/tests/api/BSApiWikiPageTasksTest.php
+++ b/tests/api/BSApiWikiPageTasksTest.php
@@ -2,6 +2,10 @@
 
 /**
  * @group medium
+ * @group API
+ * @group Database
+ * @group BlueSpice
+ * @group BlueSpiceFoundation
  *
  * Class BSApiWikiPageTasksTest
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b19d1fc398ad67964384b7f98b96bb7cbe12c3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Mglaser 
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...BlueSpiceFoundation[master]: Tests: Added to BlueSpice group

2016-12-17 Thread Mglaser (Code Review)

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

Change subject: Tests: Added to BlueSpice group
..

Tests: Added to BlueSpice group

Added tests to BlueSpice group for automated testing

Change-Id: I4b19d1fc398ad67964384b7f98b96bb7cbe12c3c
---
M tests/api/BSApiTitleQueryStoreTest.php
M tests/api/BSApiWikiPageTasksTest.php
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/22/328022/1

diff --git a/tests/api/BSApiTitleQueryStoreTest.php 
b/tests/api/BSApiTitleQueryStoreTest.php
index b80840d..611783e 100644
--- a/tests/api/BSApiTitleQueryStoreTest.php
+++ b/tests/api/BSApiTitleQueryStoreTest.php
@@ -2,6 +2,10 @@
 
 /**
  * @group medium
+ * @group API
+ * @group Database
+ * @group BlueSpice
+ * @group BlueSpiceFoundation
  *
  * Class BSApiTitleQueryStoreTest
  */
diff --git a/tests/api/BSApiWikiPageTasksTest.php 
b/tests/api/BSApiWikiPageTasksTest.php
index 122da1c..e93429f 100644
--- a/tests/api/BSApiWikiPageTasksTest.php
+++ b/tests/api/BSApiWikiPageTasksTest.php
@@ -2,6 +2,10 @@
 
 /**
  * @group medium
+ * @group API
+ * @group Database
+ * @group BlueSpice
+ * @group BlueSpiceFoundation
  *
  * Class BSApiWikiPageTasksTest
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b19d1fc398ad67964384b7f98b96bb7cbe12c3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [DONT-MERGE] p-wrapping code on DOM

2016-12-17 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328021 )

Change subject: [DONT-MERGE] p-wrapping code on DOM
..

[DONT-MERGE] p-wrapping code on DOM

* This is the p-wrapping code implemented in HTML5Depurate on the
  SAX stream.

* I haven't dealt with adding p-wrapping on blockquote, or not
  p-wrapping comments and whitespace, but that is easy to add.

* This is the DOM-equivalent of the code in HTML5Depurate.

Change-Id: I145440d29c79e81db5392d5386fa443975d147a7
---
A pwrap.js
1 file changed, 69 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/21/328021/1

diff --git a/pwrap.js b/pwrap.js
new file mode 100644
index 000..54e518d
--- /dev/null
+++ b/pwrap.js
@@ -0,0 +1,69 @@
+'use strict';
+var DU = require('./lib/utils/DOMUtils.js').DOMUtils;
+
+function flatten(a) {
+   var ret = a[0];
+   for (var i = 1; i < a.length; i++) {
+   ret = ret.concat(a[i]);
+   }
+   return ret;
+}
+
+function mergeRuns(n, a) {
+   var curr = null;
+   var ret = [];
+   a.forEach(function(v) {
+   if (curr === null) {
+   curr = { isBlock: v.isBlock, node: n };
+   ret.push(curr);
+   } else if (curr.isBlock !== v.isBlock) {
+   curr = { isBlock: v.isBlock, node: n.clone() };
+   ret.push(curr);
+   }
+   curr.node.appendChild(v.node);
+   });
+   return ret;
+}
+
+function split(n) {
+   if (!DU.isElt(n)) {
+   return [ { isBlock: false, node: n } ];
+   } else if (DU.isBlockNode(n)) {
+   return [ { isBlock: true, node: n } ];
+   } else {
+   return mergeRuns(n, flatten(
+   n.childNodes.map(function(c) {
+   return split(c);
+   })
+   ));
+   }
+}
+
+function pWrap(body) {
+   var p = null;
+   body.childNodes.forEach(function(c) {
+   var next = c.nextSibling;
+   if (DU.isBlockNode(c)) {
+   p = null;
+   } else {
+   split(c).forEach(function(v) {
+   if (v.isBlock) {
+   p = null;
+   body.insertBefore(v.node, next);
+   } else {
+   if (p === null) {
+   p = 
body.ownerDocument.createElement('P');
+   body.insertBefore(p, next);
+   }
+   p.appendChild(v.node);
+   }
+   });
+   }
+   });
+}
+
+var html = process.argv[2];
+var d = DU.parseHTML(html);
+pWrap(d.body);
+console.log('ORIG :' + html);
+console.log('P_WRAP:' + d.body.innerHTML);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I145440d29c79e81db5392d5386fa443975d147a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...OOUIPlayground[master]: Add empty metadata block to i18n files for banana check

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Add empty metadata block to i18n files for banana check
..

Add empty metadata block to i18n files for banana check

Change-Id: Iefd6822485f573d17a575279ccd590484b1f5fc1
---
M i18n/en.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OOUIPlayground 
refs/changes/20/328020/1

diff --git a/i18n/en.json b/i18n/en.json
index c6ed97c..4f9a42d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": {},
"ooui-playground-parameter-name" : "Parameter name",
"ooui-playground-parameter-type" : "Acceptable types",
"ooui-playground-parameter-desc" : "Description",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefd6822485f573d17a575279ccd590484b1f5fc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OOUIPlayground
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...MadLib[master]: Add empty metadata block to i18n files for banana check

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Add empty metadata block to i18n files for banana check
..

Add empty metadata block to i18n files for banana check

Change-Id: Id5b28c00206ee4e4593d077a19684e70e8147dd9
---
M i18n/en.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MadLib 
refs/changes/19/328019/1

diff --git a/i18n/en.json b/i18n/en.json
index 24c3a99..7e123be 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,3 +1,4 @@
 {
+   "@metadata": {},
"madlib-desc": "Adds the #madlib parser function for mad 
libs-style text"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b28c00206ee4e4593d077a19684e70e8147dd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MadLib
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...QuickSearchLookup[master]: Add empty @metadata to i18n file for banana check

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Add empty @metadata to i18n file for banana check
..

Add empty @metadata to i18n file for banana check

Change-Id: I8b9667abf9184234e32a82983ff36a6c38591b49
---
M i18n/en.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSearchLookup 
refs/changes/18/328018/1

diff --git a/i18n/en.json b/i18n/en.json
index f125156..82f253c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": {},
"quicksearchlookup-desc": "Adds a Panel with information of the first 
search result to the search result page.",
"quicksearchlookup-readmore": "Read more",
"quicksearchlookup-expand": "Expand map"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b9667abf9184234e32a82983ff36a6c38591b49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSearchLookup
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ParentPage[master]: Fix @metadata in i18n files

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Fix @metadata in i18n files
..

Fix @metadata in i18n files

Change-Id: Ibabcd1085e34550caed714fa87681f7e90ccdb48
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 10 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParentPage 
refs/changes/17/328017/1

diff --git a/i18n/en.json b/i18n/en.json
index 2b9aefd..152bf10 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,7 +1,9 @@
 {
-   "authors": [
-   "Leonid Verhovskij"
-   ],
+   "@metadata": {
+   "authors": [
+   "Leonid Verhovskij"
+   ]
+   },
"parentpage-desc": "provide special semantic property \"parent page\" 
on subpages",
"prefs-parentpage": "Parent page"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 70b0af6..2f0331c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,7 +1,9 @@
 {
-   "authors": [
-   "Leonid Verhovskij"
-   ],
+   "@metadata": {
+   "authors": [
+   "Leonid Verhovskij"
+   ]
+   },
"parentpage-desc": "extension description",
"prefs-parentpage": "label for attribute of parent page"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibabcd1085e34550caed714fa87681f7e90ccdb48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParentPage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ImportUsers[master]: Add empty metadata block to i18n files for banana check

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Add empty metadata block to i18n files for banana check
..

Add empty metadata block to i18n files for banana check

Change-Id: If4cd4b4070c092c62e1347357bc609c0e29bd592
---
M i18n/an.json
M i18n/ckb.json
M i18n/ha.json
M i18n/tk.json
4 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImportUsers 
refs/changes/16/328016/1

diff --git a/i18n/an.json b/i18n/an.json
index fc52c16..9241992 100644
--- a/i18n/an.json
+++ b/i18n/an.json
@@ -1,3 +1,4 @@
 {
+   "@metadata": {},
"importusers-log-summary-all": "Tot"
 }
diff --git a/i18n/ckb.json b/i18n/ckb.json
index 9b2f4ba..430d252 100644
--- a/i18n/ckb.json
+++ b/i18n/ckb.json
@@ -1,3 +1,4 @@
 {
+   "@metadata": {},
"importusers-log-summary": "پوختە"
 }
diff --git a/i18n/ha.json b/i18n/ha.json
index 8a4bffe..1914d3e 100644
--- a/i18n/ha.json
+++ b/i18n/ha.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": {},
"importusers-log-summary": "Taƙaici",
"importusers-log-summary-all": "Duka"
 }
diff --git a/i18n/tk.json b/i18n/tk.json
index 42d32eb..f21fef9 100644
--- a/i18n/tk.json
+++ b/i18n/tk.json
@@ -1,3 +1,4 @@
 {
+   "@metadata": {},
"importusers-log-summary-all": "Ählisi"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4cd4b4070c092c62e1347357bc609c0e29bd592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportUsers
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.special.watchlist: Fix render stampede after "Mark...

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

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

Change subject: mediawiki.special.watchlist: Fix render stampede after "Mark 
all pages visited"
..


mediawiki.special.watchlist: Fix render stampede after "Mark all pages visited"

Follow-up 9ea1142fad, f4d70ceedc, 73592aea1c.

The progress bar has a continuous animation that is rather CPU heavy.
While it is set to 'visibility hidden', this is merely a way to make the
contents of the element transparent. It is still interactable (e.g. if it
has hover or click handlers, they would trigger if hovering in that area)
and still rendered with full 60fps paint and layout.

Instead, detach and (re-)append the element as needed. Since the element
has an absolute position, it doesn't cause a content reflow when the element
is detached. This fact is already made use of considering the element is
inserted only after the submit button is clicked - without content reflow.

Change-Id: I06ef0d527044e5a6080febdb618eaffeb6ec85fa
---
M resources/src/mediawiki.special/mediawiki.special.watchlist.js
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Fomafix: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified
  Sn1per: Looks good to me, but someone else must approve



diff --git a/resources/src/mediawiki.special/mediawiki.special.watchlist.js 
b/resources/src/mediawiki.special/mediawiki.special.watchlist.js
index 9ca98c0..7cc9b9b 100644
--- a/resources/src/mediawiki.special/mediawiki.special.watchlist.js
+++ b/resources/src/mediawiki.special/mediawiki.special.watchlist.js
@@ -16,17 +16,15 @@
// Disable reset button to prevent multiple concurrent 
requests
$button.prop( 'disabled', true );
 
-   // Show progress bar
-   if ( $progressBar ) {
-   $progressBar.css( 'visibility', 'visible' );
-   } else {
+   if ( !$progressBar ) {
$progressBar = new OO.ui.ProgressBarWidget( { 
progress: false } ).$element;
$progressBar.css( {
position: 'absolute',
width: '100%'
} );
-   $resetForm.append( $progressBar );
}
+   // Show progress bar
+   $resetForm.append( $progressBar );
 
// Use action=setnotificationtimestamp to mark all as 
visited,
// then set all watchlist lines accordingly
@@ -39,7 +37,7 @@
$button.prop( 'disabled', false );
// Hide the button because further clicks can 
not generate any visual changes
$button.css( 'visibility', 'hidden' );
-   $progressBar.css( 'visibility', 'hidden' );
+   $progressBar.detach();
$( '.mw-changeslist-line-watched' )
.removeClass( 
'mw-changeslist-line-watched' )
.addClass( 
'mw-changeslist-line-not-watched' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06ef0d527044e5a6080febdb618eaffeb6ec85fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sn1per 
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...WikimediaMessages[master]: Add empty metadata block to i18n files for banana check

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Add empty metadata block to i18n files for banana check
..

Add empty metadata block to i18n files for banana check

https://integration.wikimedia.org/ci/job/npm-node-4/20572/console
21:58:20 Running "banana:all" (banana) task
21:58:20 >> No metadata block in the kk-arab messages file.
21:58:20 >> No metadata block in the kk-cyrl messages file.
21:58:20 >> No metadata block in the kk-latn messages file.
21:58:20 >> No metadata block in the ml messages file.
21:58:20 >> No metadata block in the source messages file.
21:58:20 >> No metadata block in the source messages file.
21:58:20 >> No metadata block in the documentation messages file.
21:58:20 >> No metadata block in the ar messages file.
21:58:20 >> No metadata block in the de messages file.
21:58:20 >> No metadata block in the es messages file.
21:58:20 >> No metadata block in the fr messages file.
21:58:20 >> No metadata block in the it messages file.
21:58:20 >> No metadata block in the ja messages file.
21:58:20 >> No metadata block in the pt-br messages file.
21:58:20 >> No metadata block in the source messages file.
21:58:21 Warning: Task "banana:all" failed. Use --force to continue.

Change-Id: Iec3fef22db48c33ade87d95c1d2b7549034a376f
---
M i18n/temporary/kk-arab.json
M i18n/temporary/kk-cyrl.json
M i18n/temporary/kk-latn.json
M i18n/temporary/ml.json
M i18n/wikimediaoverrides/en.json
M i18n/wikimediaoverridesnotranslate/ar.json
M i18n/wikimediaoverridesnotranslate/de.json
M i18n/wikimediaoverridesnotranslate/en.json
M i18n/wikimediaoverridesnotranslate/es.json
M i18n/wikimediaoverridesnotranslate/fr.json
M i18n/wikimediaoverridesnotranslate/it.json
M i18n/wikimediaoverridesnotranslate/ja.json
M i18n/wikimediaoverridesnotranslate/pt-br.json
M i18n/wikimediaoverridesnotranslate/qqq.json
M i18n/wikimediaprojectnames/en.json
15 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/i18n/temporary/kk-arab.json b/i18n/temporary/kk-arab.json
index 95187ae..be71912 100644
--- a/i18n/temporary/kk-arab.json
+++ b/i18n/temporary/kk-arab.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": [],
"grouppage-oversight": "{{ns:project}}:انىقتاۋشىلار",
"group-oversight": "انىقتاۋشىلار",
"group-oversight-member": "انىقتاۋشى"
diff --git a/i18n/temporary/kk-cyrl.json b/i18n/temporary/kk-cyrl.json
index 5d6bfad..7c3dce0 100644
--- a/i18n/temporary/kk-cyrl.json
+++ b/i18n/temporary/kk-cyrl.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": [],
"grouppage-oversight": "{{ns:project}}:Анықтаушылар",
"group-oversight": "Анықтаушылар",
"group-oversight-member": "анықтаушы"
diff --git a/i18n/temporary/kk-latn.json b/i18n/temporary/kk-latn.json
index a19b9b1..666c351 100644
--- a/i18n/temporary/kk-latn.json
+++ b/i18n/temporary/kk-latn.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": [],
"grouppage-oversight": "{{ns:project}}:Anıqtawşılar",
"group-oversight": "Anıqtawşılar",
"group-oversight-member": "anıqtawşı"
diff --git a/i18n/temporary/ml.json b/i18n/temporary/ml.json
index 7868000..6b907c1 100644
--- a/i18n/temporary/ml.json
+++ b/i18n/temporary/ml.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": [],
"grouppage-oversight": "{{ns:project}}:മേൽനോട്ടം",
"group-oversight": "മേൽനോട്ടക്കാർ",
"group-oversight-member": "മേൽനോട്ടം"
diff --git a/i18n/wikimediaoverrides/en.json b/i18n/wikimediaoverrides/en.json
index e546bed..368aa36 100644
--- a/i18n/wikimediaoverrides/en.json
+++ b/i18n/wikimediaoverrides/en.json
@@ -1,4 +1,5 @@
 {
+   "@metadata": [],
"wikimedia-acct_creation_throttle_hit": "Visitors to this wiki using 
your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last 
day, which is the maximum allowed in this time period.\nAs a result, visitors 
using this IP address cannot create any more accounts at the moment.\n\nIf you 
are at an event where contributing to Wikimedia projects is the focus, please 
see [[m:Mass account creation#Requesting_temporary_lift_of_IP_cap|Requesting 
temporary lift of IP cap]] to help resolve this issue.",
"wikimedia-createacct-helpusername": 
"[[{{MediaWiki:createacct-helpusername-url}}|(help me choose)]]",
"wikimedia-createacct-imgcaptcha-help": "Can't see the image? 
[[{{MediaWiki:createacct-captcha-help-url}}|Request an account]]",
diff --git a/i18n/wikimediaoverridesnotranslate/ar.json 
b/i18n/wikimediaoverridesnotranslate/ar.json
index 8f9dd84..9366af1 100644
--- a/i18n/wikimediaoverridesnotranslate/ar.json
+++ b/i18n/wikimediaoverridesnotranslate/ar.json
@@ -1,3 +1,4 @@
 {
+   "@metadata": [],
"wikimedia-privacypage": "m:Privacy_policy/ar"
 }
diff --git a/i18n/wikimediaoverridesnotranslate/de.json

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Avoid to hardcode /srv/mediawiki

2016-12-17 Thread Dereckson (Code Review)

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

Change subject: Avoid to hardcode /srv/mediawiki
..

Avoid to hardcode /srv/mediawiki

On the Wikimedia Cluster, this script is called from mwscript,
which uses the MEDIAWIKI_DEPLOYMENT_DIR environment variable to
represent the /srv/mediawiki path.

We now use also this environment variable to allow this script
to be used on machines with path another configuration, for example
to allow interwiki map update from a developer machine.

Change-Id: Icb8a1d7ffea739b6cfe631edebe00ca70127972d
---
M dumpInterwiki.php
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/80/327980/1

diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index d8a7c8c..770eb28 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -222,13 +222,14 @@
}
 
function execute() {
-   $default_all_dblist = getRealmSpecificFilename( 
'/srv/mediawiki/dblists/all.dblist' );
-   $default_special_dblist = getRealmSpecificFilename( 
'/srv/mediawiki/dblists/special.dblist' );
+   $root = getenv('MEDIAWIKI_DEPLOYMENT_DIR');
+   $default_all_dblist = getRealmSpecificFilename( $root . 
'/dblists/all.dblist' );
+   $default_special_dblist = getRealmSpecificFilename( $root . 
'/dblists/special.dblist' );
 
// List of language prefixes likely to be found in 
multi-language sites
$this->langlist = array_map( "trim", file( $this->getOption(
'langlist',
-   getRealmSpecificFilename( "/srv/mediawiki/langlist" )
+   getRealmSpecificFilename( $root . '/langlist' )
) ) );
 
// List of all database names

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb8a1d7ffea739b6cfe631edebe00ca70127972d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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

[MediaWiki-commits] [Gerrit] labs/striker[master]: Fix account creation bug

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

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

Change subject: Fix account creation bug
..


Fix account creation bug

Apparently I did a really poor job of testing the account creation flow
with some of the changes that came as a result of code review. The
LABSAUTH_MAX_UID setting was missing and UID and GID settings values were not
properly cast to integers which caused problems in computing the next
available value.

Change-Id: Ic83cd166cb365f7e0e58095da782f3ccf82942cd
---
M striker/settings.py
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/striker/settings.py b/striker/settings.py
index 87c6589..d77c509 100644
--- a/striker/settings.py
+++ b/striker/settings.py
@@ -345,12 +345,12 @@
 LABSAUTH_USER_BASE = ini.get('ldap', 'USER_SEARCH_BASE')
 LABSAUTH_GROUP_BASE = ini.get('ldap', 'BASE_DN')
 
-LABSAUTH_DEFAULT_GID = ini.get('ldap', 'DEFAULT_GID')
+LABSAUTH_DEFAULT_GID = int(ini.get('ldap', 'DEFAULT_GID'))
 LABSAUTH_DEFAULT_SHELL = ini.get('ldap', 'DEFAULT_SHELL')
-LABSAUTH_MIN_GID = ini.get('ldap', 'MIN_GID')
-LABSAUTH_MAX_GID = ini.get('ldap', 'MAX_GID')
-LABSAUTH_MIN_UID = ini.get('ldap', 'MIN_UID')
-LABSAUTH_MIN_GID = ini.get('ldap', 'MIN_GID')
+LABSAUTH_MIN_GID = int(ini.get('ldap', 'MIN_GID'))
+LABSAUTH_MAX_GID = int(ini.get('ldap', 'MAX_GID'))
+LABSAUTH_MIN_UID = int(ini.get('ldap', 'MIN_UID'))
+LABSAUTH_MAX_UID = int(ini.get('ldap', 'MAX_UID'))
 
 # == OAuth settings ==
 OAUTH_CONSUMER_KEY = ini.get('oauth', 'CONSUMER_KEY')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic83cd166cb365f7e0e58095da782f3ccf82942cd
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Yuvipanda 
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...LinkedWiki[master]: Fix for Fuseki

2016-12-17 Thread Karima Rafes (Code Review)

Karima Rafes has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327946 )

Change subject: Fix for Fuseki
..


Fix for Fuseki

Change-Id: I174bcfe996a17c880edefea3f0f757f8679545aa
---
M vendor/bordercloud/sparql/Endpoint.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Karima Rafes: Verified; Looks good to me, approved



diff --git a/vendor/bordercloud/sparql/Endpoint.php 
b/vendor/bordercloud/sparql/Endpoint.php
index f2eda22..88266bb 100644
--- a/vendor/bordercloud/sparql/Endpoint.php
+++ b/vendor/bordercloud/sparql/Endpoint.php
@@ -10,7 +10,7 @@
 require_once("ToolsConvert.php");
 require_once("ToolsBlankNode.php");
 require_once("ParserSparqlResult.php");
-//require_once("ConversionMimetype.php");
+require_once("ConversionMimetype.php");
 
 /**
  * Sparql HTTP Client for SPARQL1.1's Endpoint
@@ -537,7 +537,7 @@
 }
 }else{
 $data = array($this->_nameParameterQueryRead =>   $query,
-//"output" => 
ConversionMimetype::getShortnameOfMimetype($typeOutput), //possible fix for 
4store/fuseki..
+"output" => 
ConversionMimetype::getShortnameOfMimetype($typeOutput), //possible fix for 
4store/fuseki..
 "Accept" => $typeOutput); //fix for sesame
 //print_r($data);
 if($this->_MethodHTTPRead == "POST"){

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I174bcfe996a17c880edefea3f0f757f8679545aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 
Gerrit-Reviewer: Karima Rafes 
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...LinkedWiki[master]: Fix for Fuseki

2016-12-17 Thread Karima Rafes (Code Review)

Karima Rafes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327946 )

Change subject: Fix for Fuseki
..

Fix for Fuseki

Change-Id: I174bcfe996a17c880edefea3f0f757f8679545aa
---
M vendor/bordercloud/sparql/Endpoint.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkedWiki 
refs/changes/46/327946/1

diff --git a/vendor/bordercloud/sparql/Endpoint.php 
b/vendor/bordercloud/sparql/Endpoint.php
index f2eda22..88266bb 100644
--- a/vendor/bordercloud/sparql/Endpoint.php
+++ b/vendor/bordercloud/sparql/Endpoint.php
@@ -10,7 +10,7 @@
 require_once("ToolsConvert.php");
 require_once("ToolsBlankNode.php");
 require_once("ParserSparqlResult.php");
-//require_once("ConversionMimetype.php");
+require_once("ConversionMimetype.php");
 
 /**
  * Sparql HTTP Client for SPARQL1.1's Endpoint
@@ -537,7 +537,7 @@
 }
 }else{
 $data = array($this->_nameParameterQueryRead =>   $query,
-//"output" => 
ConversionMimetype::getShortnameOfMimetype($typeOutput), //possible fix for 
4store/fuseki..
+"output" => 
ConversionMimetype::getShortnameOfMimetype($typeOutput), //possible fix for 
4store/fuseki..
 "Accept" => $typeOutput); //fix for sesame
 //print_r($data);
 if($this->_MethodHTTPRead == "POST"){

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I174bcfe996a17c880edefea3f0f757f8679545aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Remove the old abuse filter parser class

2016-12-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327945 )

Change subject: Remove the old abuse filter parser class
..

Remove the old abuse filter parser class

Change-Id: I3431ff0a2a7169fe3743e6037eac3f2b3bf898c3
---
M AbuseFilter.php
M extension.json
R includes/AFComputedVariable.php
M includes/AbuseFilter.class.php
R includes/AbuseFilterVariableHolder.php
M includes/parser/AFPData.php
M includes/parser/AFPTreeParser.php
M includes/parser/AFPUserVisibleException.php
D includes/parser/AbuseFilterCachingParser.php
M includes/parser/AbuseFilterParser.php
M tests/phpunit/parserTest.php
11 files changed, 307 insertions(+), 350 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/45/327945/1

diff --git a/AbuseFilter.php b/AbuseFilter.php
index 72dfb8b..16df970 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -56,9 +56,6 @@
 /** @see $wgAbuseFilterEmergencyDisableThreshold */
 $wgAbuseFilterEmergencyDisableAge['default'] = 86400; // One day.
 
-/** Abuse filter parser class */
-$wgAbuseFilterParserClass = 'AbuseFilterParser';
-
 /**
  * Do users need "abusefilter-modify-restricted" user right as well as 
"abusefilter-modify"
  * in order to create or modify filters which carry out this action?
diff --git a/extension.json b/extension.json
index 2da1c32..e08ab2c 100644
--- a/extension.json
+++ b/extension.json
@@ -70,16 +70,15 @@
"AbuseFilterAliases": "AbuseFilter.alias.php"
},
"AutoloadClasses": {
-   "AbuseFilter": "AbuseFilter.class.php",
-   "AbuseFilterParser": "AbuseFilter.parser.php",
-   "AbuseFilterCachingParser": "AbuseFilter.parser.new.php",
-   "AbuseFilterTokenizer": "AbuseFilterTokenizer.php",
+   "AbuseFilter": "includes/AbuseFilter.class.php",
+   "AbuseFilterParser": "includes/parser/AbuseFilterParser.php",
+   "AbuseFilterTokenizer": 
"includes/parser/AbuseFilterTokenizer.php",
"AbuseFilterHooks": "AbuseFilter.hooks.php",
-   "AbuseFilterPreAuthenticationProvider": 
"AbuseFilterPreAuthenticationProvider.php",
+   "AbuseFilterPreAuthenticationProvider": 
"includes/AbuseFilterPreAuthenticationProvider.php",
"SpecialAbuseLog": "special/SpecialAbuseLog.php",
"AbuseLogPager": "special/SpecialAbuseLog.php",
"SpecialAbuseFilter": "special/SpecialAbuseFilter.php",
-   "AbuseLogHitFormatter": "AbuseLogHitFormatter.php",
+   "AbuseLogHitFormatter": "includes/AbuseLogHitFormatter.php",
"AbuseFilterViewList": "Views/AbuseFilterViewList.php",
"AbuseFilterPager": "Views/AbuseFilterViewList.php",
"GlobalAbuseFilterPager": "Views/AbuseFilterViewList.php",
@@ -96,15 +95,15 @@
"AbuseFilterViewDiff": "Views/AbuseFilterViewDiff.php",
"TableDiffFormatterFullContext": 
"Views/AbuseFilterViewDiff.php",
"AbuseFilterViewImport": "Views/AbuseFilterViewImport.php",
-   "AbuseFilterVariableHolder": "AbuseFilterVariableHolder.php",
-   "AFComputedVariable": "AbuseFilterVariableHolder.php",
-   "AFPData": "AbuseFilter.parser.php",
-   "AFPException": "AbuseFilter.parser.php",
-   "AFPParserState": "AbuseFilter.parser.php",
-   "AFPToken": "AbuseFilter.parser.php",
-   "AFPTreeNode": "AbuseFilter.parser.new.php",
-   "AFPTreeParser": "AbuseFilter.parser.new.php",
-   "AFPUserVisibleException": "AbuseFilter.parser.php",
+   "AbuseFilterVariableHolder": 
"includes/parser/AbuseFilterVariableHolder.php",
+   "AFComputedVariable": "includes/AFComputedVariable.php",
+   "AFPData": "includes/parser/AFPData.php",
+   "AFPException": "includes/parser/AFPException.php",
+   "AFPParserState": "includes/parser/AFParserState.php",
+   "AFPToken": "includes/parser/AFPToken.php",
+   "AFPTreeNode": "includes/parser/AFPTreeNode.php",
+   "AFPTreeParser": "includes/parser/AFPTreeParser.php",
+   "AFPUserVisibleException": "includes/AbuseFilter.parser.php",
"ApiQueryAbuseLog": "api/ApiQueryAbuseLog.php",
"ApiQueryAbuseFilters": "api/ApiQueryAbuseFilters.php",
"ApiAbuseFilterCheckSyntax": 
"api/ApiAbuseFilterCheckSyntax.php",
@@ -223,7 +222,6 @@
"default": 86400,
"_merge_strategy": "array_plus"
},
-   "AbuseFilterParserClass": "AbuseFilterParser",
"AbuseFilterRestrictions": {
"flag": false,
"throttle": false,
diff --git a/includes/parser/AFComputedVariable.php

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Move various classes to their own files

2016-12-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327944 )

Change subject: Move various classes to their own files
..

Move various classes to their own files

Change-Id: I5d418b3fa27aa6e04b9a680922e5eab2439ffb20
---
D AbuseFilter.parser.new.php
R includes/AbuseFilter.class.php
R includes/AbuseFilterPreAuthenticationProvider.php
R includes/AbuseLogHitFormatter.php
R includes/parser/AFComputedVariable.php
A includes/parser/AFPData.php
A includes/parser/AFPException.php
A includes/parser/AFPParserState.php
A includes/parser/AFPToken.php
A includes/parser/AFPTreeNode.php
A includes/parser/AFPTreeParser.php
A includes/parser/AFPUserVisibleException.php
A includes/parser/AbuseFilterCachingParser.php
R includes/parser/AbuseFilterParser.php
R includes/parser/AbuseFilterTokenizer.php
A includes/parser/AbuseFilterVariableHolder.php
16 files changed, 1,817 insertions(+), 1,810 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/44/327944/1

diff --git a/AbuseFilter.parser.new.php b/AbuseFilter.parser.new.php
deleted file mode 100644
index af7911a..000
--- a/AbuseFilter.parser.new.php
+++ /dev/null
@@ -1,1014 +0,0 @@
-type = $type;
-   $this->children = $children;
-   $this->position = $position;
-   }
-
-   public function toDebugString() {
-   return implode( "\n", $this->toDebugStringInner() );
-   }
-
-   private function toDebugStringInner() {
-   if ( $this->type == self::ATOM ) {
-   return [ "ATOM({$this->children->type} 
{$this->children->value})" ];
-   }
-
-   $align = function ( $line ) {
-   return '  ' . $line;
-   };
-
-   $lines = [ "{$this->type}" ];
-   foreach ( $this->children as $subnode ) {
-   if ( $subnode instanceof AFPTreeNode ) {
-   $sublines = array_map( $align, 
$subnode->toDebugStringInner() );
-   } elseif ( is_string( $subnode ) ) {
-   $sublines = [ "  {$subnode}" ];
-   } else {
-   throw new AFPException( "Each node parameter 
has to be either a node or a string" );
-   }
-
-   $lines = array_merge( $lines, $sublines );
-   }
-   return $lines;
-   }
-}
-
-/**
- * A parser that transforms the text of the filter into a parse tree.
- */
-class AFPTreeParser {
-   // The tokenized representation of the filter parsed.
-   public $mTokens;
-
-   // Current token handled by the parser and its position.
-   public $mCur, $mPos;
-
-   const CACHE_VERSION = 2;
-
-   /**
-* Create a new instance
-*/
-   public function __construct() {
-   $this->resetState();
-   }
-
-   public function resetState() {
-   $this->mTokens = array();
-   $this->mPos = 0;
-   }
-
-   /**
-* Advances the parser to the next token in the filter code.
-*/
-   protected function move() {
-   list( $this->mCur, $this->mPos ) = $this->mTokens[$this->mPos];
-   }
-
-   /**
-* getState() function allows parser state to be rollbacked to several 
tokens
-* back.
-*
-* @return AFPParserState
-*/
-   protected function getState() {
-   return new AFPParserState( $this->mCur, $this->mPos );
-   }
-
-   /**
-* setState() function allows parser state to be rollbacked to several 
tokens
-* back.
-*
-* @param AFPParserState $state
-*/
-   protected function setState( AFPParserState $state ) {
-   $this->mCur = $state->token;
-   $this->mPos = $state->pos;
-   }
-
-   /**
-* Parse the supplied filter source code into a tree.
-*
-* @param string $code
-* @throws AFPUserVisibleException
-* @return AFPTreeNode|null
-*/
-   public function parse( $code ) {
-   $this->mTokens = AbuseFilterTokenizer::tokenize( $code );
-   $this->mPos = 0;
-
-   return $this->doLevelEntry();
-   }
-
-   /* Levels */
-
-   /**
-* Handles unexpected characters after the expression.
-* @return AFPTreeNode|null
-* @throws AFPUserVisibleException
-*/
-   protected function doLevelEntry() {
-   $result = $this->doLevelSemicolon();
-
-   if ( $this->mCur->type != AFPToken::TNONE ) {
-   throw new AFPUserVisibleException(
-   'unexpectedatend',
-   $this->mPos, [ $this->mCur->type ]
-   );
-   }
-
-

[MediaWiki-commits] [Gerrit] labs/striker[master]: Fix account creation bug

2016-12-17 Thread BryanDavis (Code Review)

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

Change subject: Fix account creation bug
..

Fix account creation bug

Apparently I did a really poor job of testing the account creation flow
with some of the changes that came as a result of code review. The
LABSAUTH_MAX_UID setting was missing and UID and GID settings values were not
properly cast to integers which caused problems in computing the next
available value.

Change-Id: Ic83cd166cb365f7e0e58095da782f3ccf82942cd
---
M striker/settings.py
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker 
refs/changes/43/327943/1

diff --git a/striker/settings.py b/striker/settings.py
index 87c6589..d77c509 100644
--- a/striker/settings.py
+++ b/striker/settings.py
@@ -345,12 +345,12 @@
 LABSAUTH_USER_BASE = ini.get('ldap', 'USER_SEARCH_BASE')
 LABSAUTH_GROUP_BASE = ini.get('ldap', 'BASE_DN')
 
-LABSAUTH_DEFAULT_GID = ini.get('ldap', 'DEFAULT_GID')
+LABSAUTH_DEFAULT_GID = int(ini.get('ldap', 'DEFAULT_GID'))
 LABSAUTH_DEFAULT_SHELL = ini.get('ldap', 'DEFAULT_SHELL')
-LABSAUTH_MIN_GID = ini.get('ldap', 'MIN_GID')
-LABSAUTH_MAX_GID = ini.get('ldap', 'MAX_GID')
-LABSAUTH_MIN_UID = ini.get('ldap', 'MIN_UID')
-LABSAUTH_MIN_GID = ini.get('ldap', 'MIN_GID')
+LABSAUTH_MIN_GID = int(ini.get('ldap', 'MIN_GID'))
+LABSAUTH_MAX_GID = int(ini.get('ldap', 'MAX_GID'))
+LABSAUTH_MIN_UID = int(ini.get('ldap', 'MIN_UID'))
+LABSAUTH_MAX_UID = int(ini.get('ldap', 'MAX_UID'))
 
 # == OAuth settings ==
 OAUTH_CONSUMER_KEY = ini.get('oauth', 'CONSUMER_KEY')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic83cd166cb365f7e0e58095da782f3ccf82942cd
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: Bump version to 7.0 alpha 1

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

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

Change subject: Bump version to 7.0 alpha 1
..


Bump version to 7.0 alpha 1

Change-Id: Icc590290435132fbaaeae6412de6fa8f3f4e4807
---
M CHANGELOG.md
M skin.json
2 files changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bd264e..71e1827 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,7 @@
 =
 
 
-6.0
+7.0 alpha 1
 ===
 
-* Supports MediaWiki 1.28
-
+* Supports MediaWiki 1.29
diff --git a/skin.json b/skin.json
index 723b9ca..3b7bed1 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "Metrolook",
"namemsg": "skinname-metrolook",
-   "version": "6.0",
+   "version": "7.0 alpha 1",
"author": [
"immewnity",
"Paladox",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc590290435132fbaaeae6412de6fa8f3f4e4807
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 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...Metrolook[master]: Bump version to 7.0 alpha 1

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Bump version to 7.0 alpha 1
..

Bump version to 7.0 alpha 1

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/42/327942/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc590290435132fbaaeae6412de6fa8f3f4e4807
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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...Metrolook[REL1_28]: Update README

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

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

Change subject: Update README
..


Update README

Change-Id: I30d4265ffc08e1693b8c60625c85eeb78c04a226
---
M README.md
1 file changed, 14 insertions(+), 6 deletions(-)

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



diff --git a/README.md b/README.md
index 0dc6a5e..eef7342 100644
--- a/README.md
+++ b/README.md
@@ -11,29 +11,33 @@
 If you would like compatibility with older releases of MediaWiki, download the
 appropriate version for your MediaWiki from one of the URLs below:
 
+1.27
+
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_27/
+
 1.26
 
-https://github.com/paladox/Metrolook/tree/REL1_26
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_26/
 
 1.25
 
-https://github.com/paladox/Metrolook/tree/REL1_25
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_25/
 
 1.24
 
-https://github.com/paladox/Metrolook/tree/REL1_24
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_24/
 
 1.23
 
-https://github.com/paladox/Metrolook/tree/REL1_23
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_23/
 
 1.22
 
-https://github.com/paladox/Metrolook/tree/REL1_22
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_22/
 
 1.21
 
-https://github.com/paladox/Metrolook/tree/REL1_21
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_21/
 
 ### Live demo
 
@@ -80,6 +84,10 @@
 
 ## Version
 
+7.x.x requires MediaWiki 1.29.
+
+6.x.x requires MediaWiki 1.28.
+
 5.x.x requires MediaWiki 1.27.
 
 4.x.x requires MediaWiki 1.26.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30d4265ffc08e1693b8c60625c85eeb78c04a226
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 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...Metrolook[REL1_27]: MW 1.27: Bump version to 5.0

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

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

Change subject: MW 1.27: Bump version to 5.0
..


MW 1.27: Bump version to 5.0

Change-Id: Idba346147df554f6a9c39c4f74af1fae2d6b646f
---
M CHANGELOG.md
M README.md
M skin.json
3 files changed, 19 insertions(+), 7 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0edd92d..71d0eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =
 
+5.0
+===
+
+Supports MediaWiki 1.27.
 
 5.0 alpha 2
 ===
diff --git a/README.md b/README.md
index 0dc6a5e..d6ba254 100644
--- a/README.md
+++ b/README.md
@@ -11,29 +11,33 @@
 If you would like compatibility with older releases of MediaWiki, download the
 appropriate version for your MediaWiki from one of the URLs below:
 
+1.28
+
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_28/
+
 1.26
 
-https://github.com/paladox/Metrolook/tree/REL1_26
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_26/
 
 1.25
 
-https://github.com/paladox/Metrolook/tree/REL1_25
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_25/
 
 1.24
 
-https://github.com/paladox/Metrolook/tree/REL1_24
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_24/
 
 1.23
 
-https://github.com/paladox/Metrolook/tree/REL1_23
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_23/
 
 1.22
 
-https://github.com/paladox/Metrolook/tree/REL1_22
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_22/
 
 1.21
 
-https://github.com/paladox/Metrolook/tree/REL1_21
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_21/
 
 ### Live demo
 
@@ -80,6 +84,10 @@
 
 ## Version
 
+7.x.x requires MediaWiki 1.29.
+
+6.x.x requires MediaWiki 1.28.
+
 5.x.x requires MediaWiki 1.27.
 
 4.x.x requires MediaWiki 1.26.
diff --git a/skin.json b/skin.json
index f44803b..d95953e 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "Metrolook",
"namemsg": "skinname-metrolook",
-   "version": "5.0 alpha 2",
+   "version": "5.0",
"author": [
"immewnity",
"Paladox",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idba346147df554f6a9c39c4f74af1fae2d6b646f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 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...Metrolook[REL1_28]: Update README

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Update README
..

Update README

Change-Id: I30d4265ffc08e1693b8c60625c85eeb78c04a226
---
M README.md
1 file changed, 14 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/41/327941/2

diff --git a/README.md b/README.md
index 0dc6a5e..eef7342 100644
--- a/README.md
+++ b/README.md
@@ -11,29 +11,33 @@
 If you would like compatibility with older releases of MediaWiki, download the
 appropriate version for your MediaWiki from one of the URLs below:
 
+1.27
+
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_27/
+
 1.26
 
-https://github.com/paladox/Metrolook/tree/REL1_26
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_26/
 
 1.25
 
-https://github.com/paladox/Metrolook/tree/REL1_25
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_25/
 
 1.24
 
-https://github.com/paladox/Metrolook/tree/REL1_24
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_24/
 
 1.23
 
-https://github.com/paladox/Metrolook/tree/REL1_23
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_23/
 
 1.22
 
-https://github.com/paladox/Metrolook/tree/REL1_22
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_22/
 
 1.21
 
-https://github.com/paladox/Metrolook/tree/REL1_21
+https://phabricator.wikimedia.org/diffusion/SMTL/browse/REL1_21/
 
 ### Live demo
 
@@ -80,6 +84,10 @@
 
 ## Version
 
+7.x.x requires MediaWiki 1.29.
+
+6.x.x requires MediaWiki 1.28.
+
 5.x.x requires MediaWiki 1.27.
 
 4.x.x requires MediaWiki 1.26.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30d4265ffc08e1693b8c60625c85eeb78c04a226
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
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...Metrolook[REL1_28]: Bump version to 6.0

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

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

Change subject: Bump version to 6.0
..


Bump version to 6.0

Change-Id: I62687ee724487625488e224d8416073a800c4830
---
M CHANGELOG.md
M skin.json
2 files changed, 3 insertions(+), 20 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0edd92d..8bd264e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,25 +2,8 @@
 =
 
 
-5.0 alpha 2
+6.0
 ===
 
-### New settings
-
-$wgMetrolookDisableAvatar
-
-To enable please do in localsettings.php
-( Please note this is enabled by default )
-
-$wgMetrolookDisableAvatar = true;
-
-To disable please do the same in localsettings.php
-
-$wgMetrolookDisableAvatar = false;
-
-This is to use the customised version of username icon using the socialprofile 
extension.
-
-
-5.0 alpha 1
-===
+* Supports MediaWiki 1.28
 
diff --git a/skin.json b/skin.json
index 0f18494..723b9ca 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "Metrolook",
"namemsg": "skinname-metrolook",
-   "version": "5.0 alpha 2",
+   "version": "6.0",
"author": [
"immewnity",
"Paladox",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62687ee724487625488e224d8416073a800c4830
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 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...Metrolook[master]: Bump version to 6.0

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

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

Change subject: Bump version to 6.0
..


Bump version to 6.0

Change-Id: I62687ee724487625488e224d8416073a800c4830
---
M CHANGELOG.md
M skin.json
2 files changed, 3 insertions(+), 20 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0edd92d..8bd264e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,25 +2,8 @@
 =
 
 
-5.0 alpha 2
+6.0
 ===
 
-### New settings
-
-$wgMetrolookDisableAvatar
-
-To enable please do in localsettings.php
-( Please note this is enabled by default )
-
-$wgMetrolookDisableAvatar = true;
-
-To disable please do the same in localsettings.php
-
-$wgMetrolookDisableAvatar = false;
-
-This is to use the customised version of username icon using the socialprofile 
extension.
-
-
-5.0 alpha 1
-===
+* Supports MediaWiki 1.28
 
diff --git a/skin.json b/skin.json
index 0f18494..723b9ca 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "Metrolook",
"namemsg": "skinname-metrolook",
-   "version": "5.0 alpha 2",
+   "version": "6.0",
"author": [
"immewnity",
"Paladox",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62687ee724487625488e224d8416073a800c4830
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 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...Metrolook[REL1_27]: MW 1.27: Bump version to 5.0

2016-12-17 Thread Paladox (Code Review)

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

Change subject: MW 1.27: Bump version to 5.0
..

MW 1.27: Bump version to 5.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/40/327940/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idba346147df554f6a9c39c4f74af1fae2d6b646f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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...Metrolook[REL1_28]: Bump version to 6.0

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Bump version to 6.0
..

Bump version to 6.0

Change-Id: I62687ee724487625488e224d8416073a800c4830
---
M CHANGELOG.md
M skin.json
2 files changed, 3 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/39/327939/1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0edd92d..8bd264e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,25 +2,8 @@
 =
 
 
-5.0 alpha 2
+6.0
 ===
 
-### New settings
-
-$wgMetrolookDisableAvatar
-
-To enable please do in localsettings.php
-( Please note this is enabled by default )
-
-$wgMetrolookDisableAvatar = true;
-
-To disable please do the same in localsettings.php
-
-$wgMetrolookDisableAvatar = false;
-
-This is to use the customised version of username icon using the socialprofile 
extension.
-
-
-5.0 alpha 1
-===
+* Supports MediaWiki 1.28
 
diff --git a/skin.json b/skin.json
index 0f18494..723b9ca 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
 {
"name": "Metrolook",
"namemsg": "skinname-metrolook",
-   "version": "5.0 alpha 2",
+   "version": "6.0",
"author": [
"immewnity",
"Paladox",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62687ee724487625488e224d8416073a800c4830
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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...Metrolook[master]: Bump version to 6.0

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Bump version to 6.0
..

Bump version to 6.0

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/38/327938/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62687ee724487625488e224d8416073a800c4830
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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...BlogPage[master]: SQL injections, DOS vectors, XSS and oh my!

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

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

Change subject: SQL injections, DOS vectors, XSS and oh my!
..


SQL injections, DOS vectors, XSS and oh my!

Bug: T152884
Change-Id: I5e8eb624ece7e9e6c584f99d07a3ec2b25022959
---
M BlogPageClass.php
M SpecialCreateBlogPost.php
M resources/js/CreateBlogPost.js
3 files changed, 7 insertions(+), 6 deletions(-)

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



diff --git a/BlogPageClass.php b/BlogPageClass.php
index 4c2e881..29c9b30 100644
--- a/BlogPageClass.php
+++ b/BlogPageClass.php
@@ -158,6 +158,7 @@
// This unbelievably weak and hacky regex is used to find out 
the
// author's name from the category. See also getBlurb(), which 
uses a
// similar regex.
+   $categoryName = preg_quote( $categoryName, '/' );
preg_match_all(
"/\[\[(?:(?:c|C)ategory|{$categoryName}):\s?" .
// This is an absolutely unholy, horribly hacky 
and otherwise
@@ -509,7 +510,7 @@
 
// Get authors and exclude them
foreach ( $this->authors as $author ) {
-   $where[] = 'rev_user_text <> \'' . 
$author['user_name'] . '\'';
+   $where[] = 'rev_user_text <> ' . 
$dbr->addQuotes( $author['user_name'] );
}
 
$res = $dbr->select(
@@ -602,7 +603,7 @@
// Exclude the authors of the blog post from the list 
of recent
// voters
foreach ( $this->authors as $author ) {
-   $where[] = 'username <> \'' . 
$author['user_name'] . '\'';
+   $where[] = 'username <> ' . $dbr->addQuotes( 
$author['user_name'] );
}
 
$res = $dbr->select(
@@ -998,7 +999,8 @@
$output .= "{$comment['plus_count']} ";
$output .= ' getText()}\">{$comment_text}";
+   "#comment-{$comment['comment_id']}\" title=\"" .
+   htmlspecialchars( $page_title->getText() ) . 
"\">{$comment_text}";
$output .= '';
}
 
diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index 23476db..d179011 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -231,7 +231,7 @@
$tag = trim( $tag );
$blogUserCat = str_replace( '$1', '', $this->msg( 
'blog-by-user-category' )->inContentLanguage()->text() );
// Ignore "Articles by User X" categories
-   if ( !preg_match( '/' . $blogUserCat . '/', $tag ) ) {
+   if ( !preg_match( '/' . preg_quote( $blogUserCat, '/' ) 
. '/', $tag ) ) {
$slashedTag = $tag; // define variable
// Fix for categories that contain an apostrophe
if ( strpos( $tag, "'" ) ) {
diff --git a/resources/js/CreateBlogPost.js b/resources/js/CreateBlogPost.js
index bc86b8b..5c9fccf 100644
--- a/resources/js/CreateBlogPost.js
+++ b/resources/js/CreateBlogPost.js
@@ -8,8 +8,7 @@
 * @param tagnumber Integer
 */
insertTag: function( tagname, tagnumber ) {
-   document.getElementById( 'tag-' + tagnumber ).style.color = 
'#CC';
-   document.getElementById( 'tag-' + tagnumber ).innerHTML = 
tagname;
+   $( '#tag-' + tagnumber ).css( 'color', '#CC' ).text( 
tagname );
// Funny...if you move this getElementById call into a variable 
and use
// that variable here, this won't work as intended
document.getElementById( 'pageCtg' ).value +=

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e8eb624ece7e9e6c584f99d07a3ec2b25022959
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Brian Wolff 
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...Wikidata[master]: New Wikidata Build - 2016-12-17T10:00:01+0000

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

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

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


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

Change-Id: I66d55f1b4526047657a8ed27e5c9af6ee95885e5
---
M composer.lock
M extensions/Wikibase/client/config/WikibaseClient.default.php
A extensions/Wikibase/client/includes/DispatchingServiceFactory.php
A extensions/Wikibase/client/includes/DispatchingServiceWiring.php
A extensions/Wikibase/client/includes/Store/RepositoryServiceContainer.php
A extensions/Wikibase/client/includes/Store/RepositoryServiceWiring.php
M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/WikibaseClient.php
A 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceFactoryTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceContainerTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/includes/Interactors/TermIndexSearchInteractor.php
M extensions/Wikibase/lib/includes/Store/BufferingTermLookup.php
M extensions/Wikibase/lib/includes/Store/DispatchingTermBuffer.php
A extensions/Wikibase/lib/includes/Store/PrefetchingTermLookup.php
D 
extensions/Wikibase/lib/includes/Store/RepositorySpecificEntityRevisionLookupFactory.php
D 
extensions/Wikibase/lib/tests/phpunit/Store/RepositorySpecificEntityRevisionLookupFactoryTest.php
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/includes/Api/ApiErrorReporter.php
M extensions/Wikibase/repo/includes/Api/GetEntities.php
M extensions/Wikibase/repo/includes/Specials/SpecialNewProperty.php
M extensions/Wikibase/repo/maintenance/dispatchChanges.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/HtmlAssertionHelpers.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewEntityTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewItemTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewPropertyTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
M vendor/data-values/geo/Geo.php
M vendor/data-values/geo/README.md
M vendor/data-values/geo/phpcs.xml
M vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
M vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
36 files changed, 1,424 insertions(+), 526 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index b2e7573..fc0cb3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -285,16 +285,16 @@
 },
 {
 "name": "data-values/geo",
-"version": "1.2.0",
+"version": "1.2.1",
 "source": {
 "type": "git",
 "url": "https://github.com/DataValues/Geo.git;,
-"reference": "b0c635635cf3e25aed8d1d1000e50f893bd3d91c"
+"reference": "4fc2cddbdcef229665e7c2cc52a65688cd3e820d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/DataValues/Geo/zipball/b0c635635cf3e25aed8d1d1000e50f893bd3d91c;,
-"reference": "b0c635635cf3e25aed8d1d1000e50f893bd3d91c",
+"url": 
"https://api.github.com/repos/DataValues/Geo/zipball/4fc2cddbdcef229665e7c2cc52a65688cd3e820d;,
+"reference": "4fc2cddbdcef229665e7c2cc52a65688cd3e820d",
 "shasum": ""
 },
 "require": {
@@ -347,7 +347,7 @@
 "parsers",
 "wikidata"
 ],
-"time": "2016-11-11 19:17:21"
+"time": "2016-12-16 15:11:26"
 },
 {
 "name": "data-values/interfaces",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "974c74a543427b84a8dd35cbf7da6603ccde9a16"
+"reference": "32a8fe6eee79a6c505694e0c2c98ac6384873d0b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/974c74a543427b84a8dd35cbf7da6603ccde9a16;,
-"reference": "974c74a543427b84a8dd35cbf7da6603ccde9a16",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32a8fe6eee79a6c505694e0c2c98ac6384873d0b;,
+"reference": "32a8fe6eee79a6c505694e0c2c98ac6384873d0b",

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: SQL injections, DOS vectors, XSS and oh my!

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

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

Change subject: SQL injections, DOS vectors, XSS and oh my!
..

SQL injections, DOS vectors, XSS and oh my!

Bug: T152884
Change-Id: I5e8eb624ece7e9e6c584f99d07a3ec2b25022959
---
M BlogPageClass.php
M SpecialCreateBlogPost.php
M resources/js/CreateBlogPost.js
3 files changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/BlogPageClass.php b/BlogPageClass.php
index 4c2e881..29c9b30 100644
--- a/BlogPageClass.php
+++ b/BlogPageClass.php
@@ -158,6 +158,7 @@
// This unbelievably weak and hacky regex is used to find out 
the
// author's name from the category. See also getBlurb(), which 
uses a
// similar regex.
+   $categoryName = preg_quote( $categoryName, '/' );
preg_match_all(
"/\[\[(?:(?:c|C)ategory|{$categoryName}):\s?" .
// This is an absolutely unholy, horribly hacky 
and otherwise
@@ -509,7 +510,7 @@
 
// Get authors and exclude them
foreach ( $this->authors as $author ) {
-   $where[] = 'rev_user_text <> \'' . 
$author['user_name'] . '\'';
+   $where[] = 'rev_user_text <> ' . 
$dbr->addQuotes( $author['user_name'] );
}
 
$res = $dbr->select(
@@ -602,7 +603,7 @@
// Exclude the authors of the blog post from the list 
of recent
// voters
foreach ( $this->authors as $author ) {
-   $where[] = 'username <> \'' . 
$author['user_name'] . '\'';
+   $where[] = 'username <> ' . $dbr->addQuotes( 
$author['user_name'] );
}
 
$res = $dbr->select(
@@ -998,7 +999,8 @@
$output .= "{$comment['plus_count']} ";
$output .= ' getText()}\">{$comment_text}";
+   "#comment-{$comment['comment_id']}\" title=\"" .
+   htmlspecialchars( $page_title->getText() ) . 
"\">{$comment_text}";
$output .= '';
}
 
diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index 23476db..d179011 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -231,7 +231,7 @@
$tag = trim( $tag );
$blogUserCat = str_replace( '$1', '', $this->msg( 
'blog-by-user-category' )->inContentLanguage()->text() );
// Ignore "Articles by User X" categories
-   if ( !preg_match( '/' . $blogUserCat . '/', $tag ) ) {
+   if ( !preg_match( '/' . preg_quote( $blogUserCat, '/' ) 
. '/', $tag ) ) {
$slashedTag = $tag; // define variable
// Fix for categories that contain an apostrophe
if ( strpos( $tag, "'" ) ) {
diff --git a/resources/js/CreateBlogPost.js b/resources/js/CreateBlogPost.js
index bc86b8b..5c9fccf 100644
--- a/resources/js/CreateBlogPost.js
+++ b/resources/js/CreateBlogPost.js
@@ -8,8 +8,7 @@
 * @param tagnumber Integer
 */
insertTag: function( tagname, tagnumber ) {
-   document.getElementById( 'tag-' + tagnumber ).style.color = 
'#CC';
-   document.getElementById( 'tag-' + tagnumber ).innerHTML = 
tagname;
+   $( '#tag-' + tagnumber ).css( 'color', '#CC' ).text( 
tagname );
// Funny...if you move this getElementById call into a variable 
and use
// that variable here, this won't work as intended
document.getElementById( 'pageCtg' ).value +=

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e8eb624ece7e9e6c584f99d07a3ec2b25022959
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
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...Metrolook[master]: Re organise Metrolook skin

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Re organise Metrolook skin
..

Re organise Metrolook skin

This reduces some deplucations.

This update also loads the files that are needed. For example if you
want to support mobile (tablet included) and desktop then the mobile
less file is included which adds more proccessing to the browser.

Whereas if you disable mobile display then you do less processing.

Also remove two not needed any more js files. One of the files was from
mw core with customisations i made. It's no longer needed.

Change-Id: I5a1b89811af3aa158ea2531f9e242b631328e75c
---
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M SkinMetrolookHooks.php
D components/collapsibleNav.custom.less
C components/custom/common.less
C components/custom/externalLinks.less
C components/custom/footer.less
R components/custom/navigation.less
C components/custom/personalMenu.less
A components/custom/search.less
C components/custom/tabs.less
R components/custom/theme.less
C components/custom/watchstar.less
R components/main/collapsibleNav.less
R components/main/common.less
R components/main/externalLinks.less
R components/main/footer.less
C components/main/navigation.less
R components/main/personalMenu.less
A components/main/search.less
R components/main/tabs.less
R components/main/watchstar.less
D components/mobile.less
A components/mobile/mobile-custom.less
A components/mobile/mobile.less
D components/search.less
D components/tablet.less
A components/tablet/tablet-custom.less
A components/tablet/tablet.less
M i18n/qqq.json
D js/collapsibleNav.custom.js
M js/collapsibleNav.js
D js/mediawiki.searchSuggest.custom.js
M js/metrolook.js
M js/metrolook.search.js
M js/vector.js
A screen-custom.less
M screen-hd.less
M screen.less
D screen.mobile.less
M skin.json
42 files changed, 1,237 insertions(+), 2,301 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/36/327936/1

diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index da1a3ba..6a34036 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -185,10 +185,10 @@
// User name (or "Guest") to be displayed at the top right (on 
LTR
// interfaces) portion of the skin
$user = $skin->getUser();
-   if ( !$user->isLoggedIn() ) {
-   $userNameTop = $skin->msg( 'metrolook-guest' )->text();
-   } else {
+   if ( $user->isLoggedIn() ) {
$userNameTop = htmlspecialchars( $user->getName(), 
ENT_QUOTES );
+   } else {
+   $userNameTop = $skin->msg( 'metrolook-guest' )->text();
}
 
// Output HTML Page
@@ -250,17 +250,7 @@
msg( 'jumptonavigation' )
?>msg( 
'comma-separator' ) ?>
-   config->get( 
'MetrolookSearchBar' ) ) {
-   ?>
-   msg( 'jumptosearch' ) ?>
-   
-   msg( 'jumptosearch' ) ?>
-   
+   msg( 
'jumptosearch' ) ?>

html( 'bodycontent' );
@@ -359,9 +349,9 @@

config->get( 'MetrolookSiteNameText' ) ) {
-   
echo $GLOBALS['wgSitename'];
-   
} else {

echo $GLOBALS['wgMetrolookSiteText'];
+   
} else {
+   
echo $GLOBALS['wgSitename'];

}

}

?>
@@ -508,48 +498,22 @@


 
-   config->get( 'MetrolookSearchBar' ) ) {
-   ?>
-   
-   config->get( 
'MetrolookSiteNameLogo' ) ) {
-   if ( $this->config->get( 
'MetrolookLogo' ) ) {
-   ?>
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fixing mediawiki's য় problem

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

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

Change subject: Fixing mediawiki's য় problem
..


Fixing mediawiki's য় problem

Bengali $magicWords translations with য় (U+09DF) does not working because the 
character য় (U+09DF) was interpreted by MediaWiki as য (U+09AF) and nukta 
(U+09BC).

See also: https://gerrit.wikimedia.org/r/#/c/326433/

Bug: T153132
Change-Id: I6ef18acd7c1eb0ce87e81163ef0130620d48d200
---
M languages/messages/MessagesBn.php
1 file changed, 35 insertions(+), 35 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/languages/messages/MessagesBn.php 
b/languages/messages/MessagesBn.php
index 7dde2b7..4edce3d 100644
--- a/languages/messages/MessagesBn.php
+++ b/languages/messages/MessagesBn.php
@@ -174,10 +174,10 @@
 
 $magicWords = [
'redirect'=> [ 0, '#পুনর্নির্দেশ', '#পুনঃর্নির্দেশ', 
'#পুনঃনির্দেশ', '#পুননির্দেশ', '#REDIRECT' ],
-   'notoc'   => [ 0, '__কোন_বিষয়বস্তুর_ছক_নয়__', 
'__কোনবিষয়বস্তুরছকনয়__', '__কোন_বিষয়বস্তুর_টেবিল_নয়__', 
'__কোনবিষয়বস্তুরটেবিলনয়__', '__NOTOC__' ],
-   'nogallery'   => [ 0, '__কোনগ্যালারিনয়__', 
'__কোনগ্যালারীনয়__', '__কোন_গ্যালারি_নয়__', '__কোন_গ্যালারী_নয়__', 
'__NOGALLERY__' ],
-   'toc' => [ 0, '__বিষয়বস্তুর_ছক__', 
'__বিষয়বস্তুরছক__', '__বিষয়বস্তুর_টেবিল__', '__বিষয়বস্তুরটেবিল__', '__TOC__' ],
-   'noeditsection'   => [ 0, '__কোনসম্পাদনাঅনুচ্ছেদনয়__', 
'__কোন_সম্পাদনা_অনুচ্ছেদ_নয়__', '__NOEDITSECTION__' ],
+   'notoc'   => [ 0, '__কোন_বিষয়বস্তুর_ছক_নয়__', 
'__কোনবিষয়বস্তুরছকনয়__', '__কোন_বিষয়বস্তুর_টেবিল_নয়__', 
'__কোনবিষয়বস্তুরটেবিলনয়__', '__NOTOC__' ],
+   'nogallery'   => [ 0, '__কোনগ্যালারিনয়__', 
'__কোনগ্যালারীনয়__', '__কোন_গ্যালারি_নয়__', '__কোন_গ্যালারী_নয়__', 
'__NOGALLERY__' ],
+   'toc' => [ 0, '__বিষয়বস্তুর_ছক__', 
'__বিষয়বস্তুরছক__', '__বিষয়বস্তুর_টেবিল__', '__বিষয়বস্তুরটেবিল__', '__TOC__' 
],
+   'noeditsection'   => [ 0, '__কোনসম্পাদনাঅনুচ্ছেদনয়__', 
'__কোন_সম্পাদনা_অনুচ্ছেদ_নয়__', '__NOEDITSECTION__' ],
'currentmonth'=> [ 1, 'চলতি_মাস', 'চলতিমাস', 'বর্তমান_মাস', 
'বর্তমানমাস', 'বর্তমান_মাস_২', 'বর্তমানমাস২', 'CURRENTMONTH', 'CURRENTMONTH2' ],
'currentmonth1'   => [ 1, 'চলতি_মাস_১', 'চলতিমাস১', 
'বর্তমান_মাস_১', 'বর্তমানমাস১', 'CURRENTMONTH1' ],
'currentmonthname'=> [ 1, 'বর্তমান_মাসের_নাম', 
'বর্তমানমাসেরনাম', 'CURRENTMONTHNAME' ],
@@ -187,24 +187,24 @@
'currentday2' => [ 1, 'বর্তমান_দিন_২', 'বর্তমানদিন২', 
'আজকের_দিন_২', 'আজকেরদিন২', 'CURRENTDAY2' ],
'currentdayname'  => [ 1, 'বর্তমান_দিনের_নাম', 
'বর্তমানদিনেরনাম', 'আজকের_দিনের_নাম', 'আজকেরদিনেরনাম', 'CURRENTDAYNAME' ],
'currentyear' => [ 1, 'চলতি_বছর', 'চলতিবছর', 'বর্তমান_বছর', 
'বর্তমানবছর', 'CURRENTYEAR' ],
-   'currenttime' => [ 1, 'বর্তমান_সময়', 'বর্তমানসময়', 
'এখনকার_সময়', 'এখনকারসময়', 'এখন_সময়', 'CURRENTTIME' ],
+   'currenttime' => [ 1, 'বর্তমান_সময়', 'বর্তমানসময়', 
'এখনকার_সময়', 'এখনকারসময়', 'এখন_সময়', 'CURRENTTIME' ],
'currenthour' => [ 1, 'বর্তমান_ঘণ্টা', 'বর্তমানঘণ্টা', 
'বর্তমান_ঘন্টা', 'বর্তমানঘন্টা', 'এখনকার_ঘণ্টা', 'এখনকারঘণ্টা', 'CURRENTHOUR' ],
-   'localmonth'  => [ 1, 'স্থানীয়_মাস', 'স্থানীয়মাস', 
'স্থানীয়_মাস_২', 'স্থানীয়মাস২', 'LOCALMONTH', 'LOCALMONTH2' ],
-   'localmonth1' => [ 1, 'স্থানীয়_মাস_১', 'স্থানীয়মাস১', 
'LOCALMONTH1' ],
-   'localmonthname'  => [ 1, 'স্থানীয়_মাসের_নাম', 
'স্থানীয়মাসেরনাম', 'LOCALMONTHNAME' ],
-   'localmonthnamegen'   => [ 1, 'স্থানীয়_মাসের_নাম_উৎপন্ন', 
'স্থানীয়মাসেরনামউৎপন্ন', 'LOCALMONTHNAMEGEN' ],
-   'localmonthabbrev'=> [ 1, 'স্থানীয়_মাস_সংক্ষেপ', 
'স্থানীয়মাসসংক্ষেপ', 'স্থানীয়_মাস_সংক্ষিপ্ত', 'স্থানীয়মাসসংক্ষিপ্ত', 
'সংক্ষেপিত_স্থানীয়_মাস', 'সংক্ষেপিতস্থানীয়মাস', 'LOCALMONTHABBREV' ],
-   'localday'=> [ 1, 'স্থানীয়_দিন', 'স্থানীয়দিন', 
'স্থানীয়_বার', 'স্থানীয়বার', 'LOCALDAY' ],
-   'localday2'   => [ 1, 'স্থানীয়_দিন_২', 'স্থানীয়দিন২', 
'LOCALDAY2' ],
-   'localdayname'=> [ 1, 'স্থানীয়_দিনের_নাম', 
'স্থানীয়দিনেরনাম', 'LOCALDAYNAME' ],
-   'localyear'   => [ 1, 'স্থানীয়_বছর', 'স্থানীয়বছর', 
'LOCALYEAR' ],
-   'localtime'   => [ 1, 'স্থানীয়_সময়', 'স্থানীয়সময়', 
'LOCALTIME' ],
-   'localhour'   => [ 1, 'স্থানীয়_ঘণ্টা', 'স্থানীয়ঘণ্টা', 
'স্থানীয়_ঘন্টা', 'স্থানীয়ঘন্টা', 'LOCALHOUR' ],
+   'localmonth'  => [ 1, 'স্থানীয়_মাস', 'স্থানীয়মাস', 
'স্থানীয়_মাস_২', 'স্থানীয়মাস২', 'LOCALMONTH', 'LOCALMONTH2' ],
+   'localmonth1' => [ 1, 'স্থানীয়_মাস_১', 'স্থানীয়মাস১', 
'LOCALMONTH1' ],
+   'localmonthname'

[MediaWiki-commits] [Gerrit] mediawiki...Configure[master]: Fix path in $wgMessagesDirs

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Fix path in $wgMessagesDirs
..

Fix path in $wgMessagesDirs

The folder was not found due to missing slash in the path

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure 
refs/changes/35/327935/1

diff --git a/Configure.php b/Configure.php
index f78466f..abab5ef 100644
--- a/Configure.php
+++ b/Configure.php
@@ -209,7 +209,7 @@
 # Adding internationalisation...
 $wgMessagesDirs['Configure'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['Configure'] = $dir . 'Configure.i18n.php';
-$wgMessagesDirs['ConfigureSettings'] = __DIR__ . 'settings/i18n';
+$wgMessagesDirs['ConfigureSettings'] = __DIR__ . '/settings/i18n';
 $wgExtensionMessagesFiles['ConfigureSettings'] = $dir . 
'settings/Settings.i18n.php';
 
 # And special pages aliases...

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I990c3694003082b02fb1cb066280f453647cc739
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Configure
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...RegexBlock[master]: Fix the displaying of permanent blocks' expiries in the list...

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

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

Change subject: Fix the displaying of permanent blocks' expiries in the list of 
currently active blocks
..


Fix the displaying of permanent blocks' expiries in the list of currently 
active blocks

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

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



diff --git a/SpecialRegexBlock.php b/SpecialRegexBlock.php
index 83854e3..228ea2c 100644
--- a/SpecialRegexBlock.php
+++ b/SpecialRegexBlock.php
@@ -196,7 +196,7 @@
foreach ( $blocker_list as $id => $row ) {
$loop++;
$color_expire = '%s';
-   if ( $row['expiry'] == 'infinite' ) {
+   if ( $row['expiry'] == 'infinite' || 
$row['expiry'] == 'infinity' ) {
$row['expiry'] = $this->msg( 
'regexblock-view-block-infinite' )->text();
} else {
if ( wfTimestampNow() > $row['expiry'] 
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie20aadde1edcdca26ebe316d3087a07558f5bfd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RegexBlock
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...RegexBlock[master]: Fix the displaying of permanent blocks' expiries in the list...

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

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

Change subject: Fix the displaying of permanent blocks' expiries in the list of 
currently active blocks
..

Fix the displaying of permanent blocks' expiries in the list of currently 
active blocks

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RegexBlock 
refs/changes/34/327934/1

diff --git a/SpecialRegexBlock.php b/SpecialRegexBlock.php
index 83854e3..228ea2c 100644
--- a/SpecialRegexBlock.php
+++ b/SpecialRegexBlock.php
@@ -196,7 +196,7 @@
foreach ( $blocker_list as $id => $row ) {
$loop++;
$color_expire = '%s';
-   if ( $row['expiry'] == 'infinite' ) {
+   if ( $row['expiry'] == 'infinite' || 
$row['expiry'] == 'infinity' ) {
$row['expiry'] = $this->msg( 
'regexblock-view-block-infinite' )->text();
} else {
if ( wfTimestampNow() > $row['expiry'] 
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie20aadde1edcdca26ebe316d3087a07558f5bfd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RegexBlock
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...Metrolook[master]: Update to match vector changes

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

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

Change subject: Update to match vector changes
..


Update to match vector changes

Change-Id: If7ecb320a0642a66c009622946f560c6934379ca
---
M .gitignore
M components/search.less
M js/collapsibleTabs.js
A jsduck.json
M package.json
5 files changed, 80 insertions(+), 57 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 53bbca6..7c9e72a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,10 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
-
-# Composer
-/vendor
 /composer.lock
+/docs
+/node_modules
+/vendor
 
 # Operating systems
 ## Mac OS X
diff --git a/components/search.less b/components/search.less
index bbf9dc8..e7aa78e 100644
--- a/components/search.less
+++ b/components/search.less
@@ -103,6 +103,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+   }
+
+   #searchButton {
.background-image-svg('images/search-ltr.svg', 
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
@@ -229,6 +232,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+   }
+
+   #searchButton {
.background-image-svg('images/search-ltr.svg', 
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
diff --git a/js/collapsibleTabs.js b/js/collapsibleTabs.js
index 1c8891f..30367da 100644
--- a/js/collapsibleTabs.js
+++ b/js/collapsibleTabs.js
@@ -1,10 +1,31 @@
 /**
- * Collapsible tabs jQuery Plugin
+ * Collapsible Tabs for the Metrolook skin.
+ *
+ * @class jQuery.plugin.collapsibleTabs
  */
 ( function ( $ ) {
-   var rtl = $( 'html' ).attr( 'dir' ) === 'rtl',
+   var isRTL = document.documentElement.dir === 'rtl',
+   boundEvent = false,
rAF = window.requestAnimationFrame || setTimeout;
 
+   /**
+* @event beforeTabCollapse
+*/
+
+   /**
+* @event afterTabCollapse
+*/
+
+   /**
+* @param {Object} [options]
+* @param {string} [options.expandedContainer="#p-views ul"] List of 
tabs
+* @param {string} [options.collapsedContainer="#p-cactions ul"] List 
of menu items
+* @param {string} [options.collapsible="li.collapsible"] Match tabs 
that are collapsible
+* @param {Function} [options.expandCondition]
+* @param {Function} [options.collapseCondition]
+* @return {jQuery}
+* @chainable
+*/
$.fn.collapsibleTabs = function ( options ) {
// Merge options into the defaults
var settings = $.extend( {}, $.collapsibleTabs.defaults, 
options );
@@ -17,7 +38,7 @@
this.each( function () {
var $el = $( this );
// add the element to our array of collapsible managers
-   $.collapsibleTabs.instances = 
$.collapsibleTabs.instances.add( $el );
+   $.collapsibleTabs.instances.push( $el );
// attach the settings to the elements
$el.data( 'collapsibleTabsSettings', settings );
// attach data to our collapsible elements
@@ -27,11 +48,11 @@
} );
 
// if we haven't already bound our resize handler, bind it now
-   if ( !$.collapsibleTabs.boundEvent ) {
+   if ( !boundEvent ) {
+   boundEvent = true;
$( window ).on( 'resize', $.debounce( 100, function () {
rAF( $.collapsibleTabs.handleResize );
} ) );
-   $.collapsibleTabs.boundEvent = true;
}
 
// call our resize handler to setup the page
@@ -39,8 +60,7 @@
return this;
};
$.collapsibleTabs = {
-   instances: $( [] ),
-   boundEvent: null,
+   instances: [],
defaults: {
expandedContainer: '#p-views ul',
collapsedContainer: '#p-cactions ul',
@@ -62,8 +82,7 @@
$collapsible.data( 'collapsibleTabsSettings', {
expandedContainer: 
settings.expandedContainer,
collapsedContainer: 
settings.collapsedContainer,
-   expandedWidth: $collapsible.width(),
-   prevElement: $collapsible.prev()
+   expandedWidth: $collapsible.width()

[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: Update to match vector changes

2016-12-17 Thread Paladox (Code Review)

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

Change subject: Update to match vector changes
..

Update to match vector changes

Change-Id: If7ecb320a0642a66c009622946f560c6934379ca
---
M .gitignore
M components/search.less
M js/collapsibleTabs.js
A jsduck.json
M package.json
5 files changed, 80 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/33/327933/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..7c9e72a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,10 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
-
-# Composer
-/vendor
 /composer.lock
+/docs
+/node_modules
+/vendor
 
 # Operating systems
 ## Mac OS X
diff --git a/components/search.less b/components/search.less
index bbf9dc8..e7aa78e 100644
--- a/components/search.less
+++ b/components/search.less
@@ -103,6 +103,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+   }
+
+   #searchButton {
.background-image-svg('images/search-ltr.svg', 
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
@@ -229,6 +232,9 @@
direction: ltr;
white-space: nowrap;
overflow: hidden;
+   }
+
+   #searchButton {
.background-image-svg('images/search-ltr.svg', 
'images/search-ltr.png');
background-position: center center;
background-repeat: no-repeat;
diff --git a/js/collapsibleTabs.js b/js/collapsibleTabs.js
index 1c8891f..c37d76b 100644
--- a/js/collapsibleTabs.js
+++ b/js/collapsibleTabs.js
@@ -1,10 +1,31 @@
 /**
- * Collapsible tabs jQuery Plugin
+ * Collapsible Tabs for the Vector skin.
+ *
+ * @class jQuery.plugin.collapsibleTabs
  */
 ( function ( $ ) {
-   var rtl = $( 'html' ).attr( 'dir' ) === 'rtl',
+   var isRTL = document.documentElement.dir === 'rtl',
+   boundEvent = false,
rAF = window.requestAnimationFrame || setTimeout;
 
+   /**
+* @event beforeTabCollapse
+*/
+
+   /**
+* @event afterTabCollapse
+*/
+
+   /**
+* @param {Object} [options]
+* @param {string} [options.expandedContainer="#p-views ul"] List of 
tabs
+* @param {string} [options.collapsedContainer="#p-cactions ul"] List 
of menu items
+* @param {string} [options.collapsible="li.collapsible"] Match tabs 
that are collapsible
+* @param {Function} [options.expandCondition]
+* @param {Function} [options.collapseCondition]
+* @return {jQuery}
+* @chainable
+*/
$.fn.collapsibleTabs = function ( options ) {
// Merge options into the defaults
var settings = $.extend( {}, $.collapsibleTabs.defaults, 
options );
@@ -17,7 +38,7 @@
this.each( function () {
var $el = $( this );
// add the element to our array of collapsible managers
-   $.collapsibleTabs.instances = 
$.collapsibleTabs.instances.add( $el );
+   $.collapsibleTabs.instances.push( $el );
// attach the settings to the elements
$el.data( 'collapsibleTabsSettings', settings );
// attach data to our collapsible elements
@@ -27,11 +48,11 @@
} );
 
// if we haven't already bound our resize handler, bind it now
-   if ( !$.collapsibleTabs.boundEvent ) {
+   if ( !boundEvent ) {
+   boundEvent = true;
$( window ).on( 'resize', $.debounce( 100, function () {
rAF( $.collapsibleTabs.handleResize );
} ) );
-   $.collapsibleTabs.boundEvent = true;
}
 
// call our resize handler to setup the page
@@ -39,8 +60,7 @@
return this;
};
$.collapsibleTabs = {
-   instances: $( [] ),
-   boundEvent: null,
+   instances: [],
defaults: {
expandedContainer: '#p-views ul',
collapsedContainer: '#p-cactions ul',
@@ -62,8 +82,7 @@
$collapsible.data( 'collapsibleTabsSettings', {
expandedContainer: 
settings.expandedContainer,
collapsedContainer: 
settings.collapsedContainer,
-   expandedWidth: $collapsible.width(),
-   prevElement: $collapsible.prev()
+   expandedWidth: $collapsible.width()

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Special:GiveGift should use autocompletion to make finding u...

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

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327932 )

Change subject: Special:GiveGift should use autocompletion to make finding 
users easier
..


Special:GiveGift should use autocompletion to make finding users easier

Bug: T153519
Change-Id: I9a0d7eb12e937ae5c8e343378d6a40ae8ad54a7f
---
M UserGifts/SpecialGiveGift.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/UserGifts/SpecialGiveGift.php b/UserGifts/SpecialGiveGift.php
index a4a8259..5550bd7 100644
--- a/UserGifts/SpecialGiveGift.php
+++ b/UserGifts/SpecialGiveGift.php
@@ -241,6 +241,7 @@
global $wgFriendingEnabled;
 
$this->getOutput()->setPageTitle( $this->msg( 
'g-give-no-user-title' )->plain() );
+   $this->getOutput()->addModules( 'mediawiki.userSuggest' );
 
$output = '' .
Html::hidden( 'title', $this->getPageTitle() ) .
@@ -281,7 +282,7 @@
$this->msg( 'g-give-enter-friend-title' 
)->plain() .
'

-   
+   




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a0d7eb12e937ae5c8e343378d6a40ae8ad54a7f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SocialProfile
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...SocialProfile[master]: Special:GiveGift should use autocompletion to make finding u...

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

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

Change subject: Special:GiveGift should use autocompletion to make finding 
users easier
..

Special:GiveGift should use autocompletion to make finding users easier

Bug: T153519
Change-Id: I9a0d7eb12e937ae5c8e343378d6a40ae8ad54a7f
---
M UserGifts/SpecialGiveGift.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/UserGifts/SpecialGiveGift.php b/UserGifts/SpecialGiveGift.php
index a4a8259..8e13c90 100644
--- a/UserGifts/SpecialGiveGift.php
+++ b/UserGifts/SpecialGiveGift.php
@@ -241,6 +241,7 @@
global $wgFriendingEnabled;
 
$this->getOutput()->setPageTitle( $this->msg( 
'g-give-no-user-title' )->plain() );
+   $this->getOutput()->addModules( 'mediawiki.userSuggest' );
 
$output = '' .
Html::hidden( 'title', $this->getPageTitle() ) .
@@ -281,7 +282,7 @@
$this->msg( 'g-give-enter-friend-title' 
)->plain() .
'

-   
+   




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a0d7eb12e937ae5c8e343378d6a40ae8ad54a7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
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...NewSignupPage[master]: Version 0.9.1: use the core-provided error message and error...

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

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

Change subject: Version 0.9.1: use the core-provided error message and error 
message CSS class instead of rolling out our own solution
..


Version 0.9.1: use the core-provided error message and error message CSS class 
instead of rolling out our own solution

Bug: T147255
Bug: T153526
Change-Id: If6c27268c9db0e3ba87d3fdb1f0511245ceb424d
---
M NewSignupPage.js
M extension.json
M i18n/en.json
M i18n/fi.json
4 files changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/NewSignupPage.js b/NewSignupPage.js
index 810a080..70a5070 100644
--- a/NewSignupPage.js
+++ b/NewSignupPage.js
@@ -21,9 +21,9 @@
!( $( 'input#wpPassword2' ).val() === $( 
'input#wpRetype' ).val() )
)
{
-   var message = mw.msg( 'newsignuppage-password-mismatch' 
);
+   var message = mw.msg( 'badretype' );
$( 'input#wpRetype' ).parent().append(
-   '' +
+   '' +
message + ''
);
}
diff --git a/extension.json b/extension.json
index d3222d5..829828e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "New Signup Page",
-   "version": "0.9",
+   "version": "0.9.1",
"author": [
"Jack Phoenix"
],
@@ -37,7 +37,7 @@
"ext.newsignuppage": {
"scripts": "NewSignupPage.js",
"messages": [
-   "newsignuppage-password-mismatch"
+   "badretype"
],
"position": "bottom"
}
diff --git a/i18n/en.json b/i18n/en.json
index 4f9b117..6201302 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,7 +2,6 @@
"@metadata": {
"authors": []
},
-   "newsignuppage-password-mismatch": "Passwords don't match!",
"newsignuppage-recruited": "recruited [$1 $2]",
"shoutwiki-loginform-tos": "I am over 13 years of age and I have read, 
understood and agree to be bound by the 
[http://www.shoutwiki.com/wiki/Terms_of_use Terms of Service] and 
[http://www.shoutwiki.com/wiki/Privacy_policy Privacy Policy]",
"shoutwiki-must-accept-tos": "You must accept the site's Terms of 
Service in order to be able to create an account!",
diff --git a/i18n/fi.json b/i18n/fi.json
index 853fd7a..1fd951e 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -2,7 +2,6 @@
 "@metadata": {
 "authors": []
 },
-   "newsignuppage-password-mismatch": "Salasanat eivät täsmää!",
 "newsignuppage-recruited": "värväsi käyttäjän [$1 $2]",
 "shoutwiki-loginform-tos": "Olen yli 13-vuotias ja olen lukenut, 
ymmärtänyt ja sitoutunut noudattamaan 
[http://www.shoutwiki.com/wiki/Terms_of_use käyttöehtoja] ja 
[http://www.shoutwiki.com/wiki/Privacy_policy tietosuojakäytäntöä]",
 "shoutwiki-must-accept-tos": "Sinun tulee hyväksyä sivuston käyttöehdot 
voidaksesi luoda tunnuksen!",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6c27268c9db0e3ba87d3fdb1f0511245ceb424d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewSignupPage
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...NewSignupPage[master]: Version 0.9.1: use the core-provided error message and error...

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

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

Change subject: Version 0.9.1: use the core-provided error message and error 
message CSS class instead of rolling out our own solution
..

Version 0.9.1: use the core-provided error message and error message CSS class 
instead of rolling out our own solution

Bug: T147255
Bug: T153526
Change-Id: If6c27268c9db0e3ba87d3fdb1f0511245ceb424d
---
M NewSignupPage.js
M extension.json
M i18n/en.json
M i18n/fi.json
4 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewSignupPage 
refs/changes/31/327931/1

diff --git a/NewSignupPage.js b/NewSignupPage.js
index 810a080..70a5070 100644
--- a/NewSignupPage.js
+++ b/NewSignupPage.js
@@ -21,9 +21,9 @@
!( $( 'input#wpPassword2' ).val() === $( 
'input#wpRetype' ).val() )
)
{
-   var message = mw.msg( 'newsignuppage-password-mismatch' 
);
+   var message = mw.msg( 'badretype' );
$( 'input#wpRetype' ).parent().append(
-   '' +
+   '' +
message + ''
);
}
diff --git a/extension.json b/extension.json
index d3222d5..829828e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "New Signup Page",
-   "version": "0.9",
+   "version": "0.9.1",
"author": [
"Jack Phoenix"
],
@@ -37,7 +37,7 @@
"ext.newsignuppage": {
"scripts": "NewSignupPage.js",
"messages": [
-   "newsignuppage-password-mismatch"
+   "badretype"
],
"position": "bottom"
}
diff --git a/i18n/en.json b/i18n/en.json
index 4f9b117..6201302 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,7 +2,6 @@
"@metadata": {
"authors": []
},
-   "newsignuppage-password-mismatch": "Passwords don't match!",
"newsignuppage-recruited": "recruited [$1 $2]",
"shoutwiki-loginform-tos": "I am over 13 years of age and I have read, 
understood and agree to be bound by the 
[http://www.shoutwiki.com/wiki/Terms_of_use Terms of Service] and 
[http://www.shoutwiki.com/wiki/Privacy_policy Privacy Policy]",
"shoutwiki-must-accept-tos": "You must accept the site's Terms of 
Service in order to be able to create an account!",
diff --git a/i18n/fi.json b/i18n/fi.json
index 853fd7a..1fd951e 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -2,7 +2,6 @@
 "@metadata": {
 "authors": []
 },
-   "newsignuppage-password-mismatch": "Salasanat eivät täsmää!",
 "newsignuppage-recruited": "värväsi käyttäjän [$1 $2]",
 "shoutwiki-loginform-tos": "Olen yli 13-vuotias ja olen lukenut, 
ymmärtänyt ja sitoutunut noudattamaan 
[http://www.shoutwiki.com/wiki/Terms_of_use käyttöehtoja] ja 
[http://www.shoutwiki.com/wiki/Privacy_policy tietosuojakäytäntöä]",
 "shoutwiki-must-accept-tos": "Sinun tulee hyväksyä sivuston käyttöehdot 
voidaksesi luoda tunnuksen!",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c27268c9db0e3ba87d3fdb1f0511245ceb424d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewSignupPage
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/core[master]: Fix deprecation message - use correct method name (defaultPr...

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

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

Change subject: Fix deprecation message - use correct method name 
(defaultPrefixSearch)
..


Fix deprecation message - use correct method name (defaultPrefixSearch)

Change-Id: Ie4dbb28b4ca11ecfeaccd331db55f92130f6cdf1
---
M includes/PrefixSearch.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 04c17e4..48b1d72 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -23,7 +23,7 @@
 /**
  * Handles searching prefixes of titles and finding any page
  * names that match. Used largely by the OpenSearch implementation.
- * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or 
SearchEngine::completionSearch
+ * @deprecated Since 1.27, Use SearchEngine::defaultPrefixSearch or 
SearchEngine::completionSearch
  *
  * @ingroup Search
  */
@@ -369,7 +369,7 @@
 
 /**
  * Performs prefix search, returning Title objects
- * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or 
SearchEngine::completionSearch
+ * @deprecated Since 1.27, Use SearchEngine::defaultPrefixSearch or 
SearchEngine::completionSearch
  * @ingroup Search
  */
 class TitlePrefixSearch extends PrefixSearch {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4dbb28b4ca11ecfeaccd331db55f92130f6cdf1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: MaxSem 
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...ContentTranslation[master]: Fix eslint error

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Fix eslint error
..

Fix eslint error

Change-Id: I08e65de879b6016b65ad5bca76b77893e65a2491
---
M tests/qunit/translation/ext.cx.translation.loader.test.js
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/30/327930/1

diff --git a/tests/qunit/translation/ext.cx.translation.loader.test.js 
b/tests/qunit/translation/ext.cx.translation.loader.test.js
index 3f4fe8b..ddd93a7 100644
--- a/tests/qunit/translation/ext.cx.translation.loader.test.js
+++ b/tests/qunit/translation/ext.cx.translation.loader.test.js
@@ -6,13 +6,14 @@
 ( function ( $, mw ) {
'use strict';
 
-   var tests = [ {
-   description: 'All ids of source and draft match perfectly',
-   source: 'Paragraph 1',
-   placeholders: '',
-   draft: 'PARAGRAPH 1',
-   translation: 'PARAGRAPH 1'
-   },
+   var tests = [
+   {
+   description: 'All ids of source and draft match 
perfectly',
+   source: 'Paragraph 1',
+   placeholders: '',
+   draft: 'PARAGRAPH 1',
+   translation: 'PARAGRAPH 1'
+   },
{
description: 'All ids of source and draft match 
perfectly, Restoring old draft using sequence ids',
source: 'Paragraph 
1',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08e65de879b6016b65ad5bca76b77893e65a2491
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: RandomUsersWithAvatars should provide the username in an alt...

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

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

Change subject: RandomUsersWithAvatars should provide the username in an alt 
attribute for each avatar image
..


RandomUsersWithAvatars should provide the username in an alt attribute for each 
avatar image

Bug: T153521
Change-Id: I791d6d4873ff331e71c9227f3f96067b32c748d4
---
M RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 5e4c282..47d8feb 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -73,7 +73,7 @@
$user_link = Title::makeTitle( NS_USER, 
$user_name );
 
$output .= '' . 
$avatar->getAvatarURL() . '';
+   '" rel="nofollow">' . 
$avatar->getAvatarURL( array( 'title' => $user_name ) ) . '';
 
if ( $x == $count || $x != 1 && $x % $per_row 
== 0 ) {
$output .= '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I791d6d4873ff331e71c9227f3f96067b32c748d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
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...NewUsersList[master]: NewUsersList should provide the username in an alt attribute...

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

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

Change subject: NewUsersList should provide the username in an alt attribute 
for each avatar image
..


NewUsersList should provide the username in an alt attribute for each avatar 
image

Bug: T153523
Change-Id: I9d0388617a27526f5e44709f63ae09a8ce37859e
---
M NewUsersList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/NewUsersList.class.php b/NewUsersList.class.php
index 3e0ea73..d9723dc 100644
--- a/NewUsersList.class.php
+++ b/NewUsersList.class.php
@@ -107,7 +107,7 @@
$userLink = Title::makeTitle( NS_USER, 
$user['user_name'] );
 
$output .= '' . 
$avatar->getAvatarURL() . '';
+   '" rel="nofollow">' . 
$avatar->getAvatarURL( array( 'title' => $user['user_name'] ) ) . '';
 
if ( ( $x == $count ) || ( $x != 1 ) && ( $x % 
$per_row == 0 ) ) {
$output .= '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d0388617a27526f5e44709f63ae09a8ce37859e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUsersList
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...RandomUsersWithAvatars[master]: RandomUsersWithAvatars should provide the username in an alt...

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

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

Change subject: RandomUsersWithAvatars should provide the username in an alt 
attribute for each avatar image
..

RandomUsersWithAvatars should provide the username in an alt attribute for each 
avatar image

Bug: T153521
Change-Id: I791d6d4873ff331e71c9227f3f96067b32c748d4
---
M RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomUsersWithAvatars 
refs/changes/29/327929/1

diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 5e4c282..47d8feb 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -73,7 +73,7 @@
$user_link = Title::makeTitle( NS_USER, 
$user_name );
 
$output .= '' . 
$avatar->getAvatarURL() . '';
+   '" rel="nofollow">' . 
$avatar->getAvatarURL( array( 'title' => $user_name ) ) . '';
 
if ( $x == $count || $x != 1 && $x % $per_row 
== 0 ) {
$output .= '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I791d6d4873ff331e71c9227f3f96067b32c748d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
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...NewUsersList[master]: NewUsersList should provide the username in an alt attribute...

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

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

Change subject: NewUsersList should provide the username in an alt attribute 
for each avatar image
..

NewUsersList should provide the username in an alt attribute for each avatar 
image

Bug: T153523
Change-Id: I9d0388617a27526f5e44709f63ae09a8ce37859e
---
M NewUsersList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewUsersList 
refs/changes/28/327928/1

diff --git a/NewUsersList.class.php b/NewUsersList.class.php
index 3e0ea73..d9723dc 100644
--- a/NewUsersList.class.php
+++ b/NewUsersList.class.php
@@ -107,7 +107,7 @@
$userLink = Title::makeTitle( NS_USER, 
$user['user_name'] );
 
$output .= '' . 
$avatar->getAvatarURL() . '';
+   '" rel="nofollow">' . 
$avatar->getAvatarURL( array( 'title' => $user['user_name'] ) ) . '';
 
if ( ( $x == $count ) || ( $x != 1 ) && ( $x % 
$per_row == 0 ) ) {
$output .= '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d0388617a27526f5e44709f63ae09a8ce37859e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUsersList
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...SocialProfile[master]: Allow callers to override the default alt attribute in wAvat...

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

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327927 )

Change subject: Allow callers to override the default alt attribute in 
wAvatar::getAvatarURL()
..


Allow callers to override the default alt attribute in wAvatar::getAvatarURL()

Bug: T153521
Bug: T153523
Change-Id: Ic9494d74c625df84025a1074088756254785239d
---
M UserProfile/AvatarClass.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/UserProfile/AvatarClass.php b/UserProfile/AvatarClass.php
index 656e09f..eda5add 100644
--- a/UserProfile/AvatarClass.php
+++ b/UserProfile/AvatarClass.php
@@ -63,9 +63,13 @@
 
$defaultParams = array(
'src' => 
"{$wgUploadPath}/avatars/{$this->getAvatarImage()}",
-   'alt' => 'avatar',
'border' => '0',
);
+   // Allow callers to add a different alt attribute and only add 
this
+   // default one if no alt attribute was provided in $extraParams
+   if ( empty( $extraParams['alt'] ) ) {
+   $defaultParams['alt'] = 'avatar';
+   }
 
if ( $wgUserProfileDisplay['avatar'] === false ) {
$defaultParams['src'] = 
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7';
 // Replace by a white pixel

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9494d74c625df84025a1074088756254785239d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Allow callers to override the default alt attribute in wAvat...

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

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

Change subject: Allow callers to override the default alt attribute in 
wAvatar::getAvatarURL()
..

Allow callers to override the default alt attribute in wAvatar::getAvatarURL()

Bug: T153521
Bug: T153523
Change-Id: Ic9494d74c625df84025a1074088756254785239d
---
M UserProfile/AvatarClass.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/UserProfile/AvatarClass.php b/UserProfile/AvatarClass.php
index 656e09f..eda5add 100644
--- a/UserProfile/AvatarClass.php
+++ b/UserProfile/AvatarClass.php
@@ -63,9 +63,13 @@
 
$defaultParams = array(
'src' => 
"{$wgUploadPath}/avatars/{$this->getAvatarImage()}",
-   'alt' => 'avatar',
'border' => '0',
);
+   // Allow callers to add a different alt attribute and only add 
this
+   // default one if no alt attribute was provided in $extraParams
+   if ( empty( $extraParams['alt'] ) ) {
+   $defaultParams['alt'] = 'avatar';
+   }
 
if ( $wgUserProfileDisplay['avatar'] === false ) {
$defaultParams['src'] = 
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7';
 // Replace by a white pixel

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9494d74c625df84025a1074088756254785239d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
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...EnhanceContactForm[master]: Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n l...

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

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

Change subject: Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n 
loading fix
..


Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n loading fix

Change-Id: I07fcce5c7a7dae53a567620129b203979e24a69c
---
M EnhanceContactForm.php
1 file changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/EnhanceContactForm.php b/EnhanceContactForm.php
index 4e05db1..d70b011 100644
--- a/EnhanceContactForm.php
+++ b/EnhanceContactForm.php
@@ -24,11 +24,13 @@
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['other'][] = array(
'name' => 'EnhanceContactForm',
-   'version' => '0.6',
+   'version' => '0.6.2',
'author' => 'Jack Phoenix',
'url' => 'https://www.mediawiki.org/wiki/Extension:EnhanceContactForm',
'descriptionmsg' => 'enhancecontactform-desc',
 );
+
+$wgMessagesDirs['EnhanceContactForm'] = __DIR__ . '/i18n';
 
 $wgHooks['ContactForm'][] = 'enhanceContactForm';
 
@@ -46,8 +48,20 @@
$text .= 'IP address of the reporter: ' . $wgRequest->getIP() . "\n";
 
if ( class_exists( 'MyInfo' ) ) {
+   global $IP;
+   require_once $IP . '/extensions/MyInfo/browser_detector.php';
$myinfo = new MyInfo();
-   $myinfo->browser = get_browser( null, true );
+
+   // Stupid hack for HHVM since HHVM doesn't implement PHP's 
native get_browser() :-(
+   // @see http://docs.hhvm.com/manual/en/function.get-browser.php
+   // @see https://github.com/facebook/hhvm/issues/2541
+   if ( get_cfg_var( 'browscap' ) ) {
+   $myinfo->browser = get_browser( null, true );
+   } else {
+   require_once $IP . 
'/extensions/MyInfo/php-local-browscap.php';
+   $myinfo->browser = get_browser_local( null, true );
+   }
+
$myinfo->info = browser_detection( 'full' );
$myinfo->info[] = browser_detection( 'moz_version' );
$text .= 'Browser: ' . $myinfo->getBrowser() . "\n";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07fcce5c7a7dae53a567620129b203979e24a69c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EnhanceContactForm
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...EnhanceContactForm[master]: Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n l...

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

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

Change subject: Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n 
loading fix
..

Version 0.6.2 from ShoutWiki: HHVM compatibility fix, i18n loading fix

Change-Id: I07fcce5c7a7dae53a567620129b203979e24a69c
---
M EnhanceContactForm.php
1 file changed, 16 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EnhanceContactForm 
refs/changes/26/327926/1

diff --git a/EnhanceContactForm.php b/EnhanceContactForm.php
index 4e05db1..d70b011 100644
--- a/EnhanceContactForm.php
+++ b/EnhanceContactForm.php
@@ -24,11 +24,13 @@
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['other'][] = array(
'name' => 'EnhanceContactForm',
-   'version' => '0.6',
+   'version' => '0.6.2',
'author' => 'Jack Phoenix',
'url' => 'https://www.mediawiki.org/wiki/Extension:EnhanceContactForm',
'descriptionmsg' => 'enhancecontactform-desc',
 );
+
+$wgMessagesDirs['EnhanceContactForm'] = __DIR__ . '/i18n';
 
 $wgHooks['ContactForm'][] = 'enhanceContactForm';
 
@@ -46,8 +48,20 @@
$text .= 'IP address of the reporter: ' . $wgRequest->getIP() . "\n";
 
if ( class_exists( 'MyInfo' ) ) {
+   global $IP;
+   require_once $IP . '/extensions/MyInfo/browser_detector.php';
$myinfo = new MyInfo();
-   $myinfo->browser = get_browser( null, true );
+
+   // Stupid hack for HHVM since HHVM doesn't implement PHP's 
native get_browser() :-(
+   // @see http://docs.hhvm.com/manual/en/function.get-browser.php
+   // @see https://github.com/facebook/hhvm/issues/2541
+   if ( get_cfg_var( 'browscap' ) ) {
+   $myinfo->browser = get_browser( null, true );
+   } else {
+   require_once $IP . 
'/extensions/MyInfo/php-local-browscap.php';
+   $myinfo->browser = get_browser_local( null, true );
+   }
+
$myinfo->info = browser_detection( 'full' );
$myinfo->info[] = browser_detection( 'moz_version' );
$text .= 'Browser: ' . $myinfo->getBrowser() . "\n";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07fcce5c7a7dae53a567620129b203979e24a69c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EnhanceContactForm
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] analytics/refinery[master]: Remove legacy TSV jobs

2016-12-17 Thread Joal (Code Review)

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

Change subject: Remove legacy TSV jobs
..


Remove legacy TSV jobs

When deploying this change, we also need to:

* kill the legacy_tsvs oozie bunde
* remove TSVs from hdfs: /wmf/data/archive/webrequest
* remove TSV copies on stat1002: /a/log/webrequest/archive/

Bug: T153082
Change-Id: I8c6568e058ea8d6a3284eece2cdff4c8e8b068de
---
M bin/refinery-dump-status-webrequest-partitions
D oozie/webrequest/legacy_tsvs/bundle.properties
D oozie/webrequest/legacy_tsvs/bundle.xml
D oozie/webrequest/legacy_tsvs/coordinator_misc.xml
D oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml
D oozie/webrequest/legacy_tsvs/coordinator_text.xml
D oozie/webrequest/legacy_tsvs/coordinator_text_upload.xml
D oozie/webrequest/legacy_tsvs/coordinator_upload.xml
D oozie/webrequest/legacy_tsvs/generate_5xx-misc_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_5xx-text_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_5xx-upload_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_5xx_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_api-usage_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_edits_tsv.hql
D oozie/webrequest/legacy_tsvs/generate_sampled-1000_tsv.hql
D oozie/webrequest/legacy_tsvs/workflow.xml
16 files changed, 0 insertions(+), 1,276 deletions(-)

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



diff --git a/bin/refinery-dump-status-webrequest-partitions 
b/bin/refinery-dump-status-webrequest-partitions
index 575c20b..b5ff0bc 100755
--- a/bin/refinery-dump-status-webrequest-partitions
+++ b/bin/refinery-dump-status-webrequest-partitions
@@ -17,7 +17,6 @@
   --datasets DATASET1,DATASET2,...
   -- Select the datasets to output data for.
  The following datasets are available:
-   legacy_tsvs  -- legacy webrequest TSVs (daily)
mediacounts  -- mediacounts (daily)
pagecounts-all-sites -- pagecounts-all-sites (hourly)
pagecounts-raw   -- pagecounts-raw (hourly)
@@ -75,7 +74,6 @@
 DATASET_VISIBILITIES["$DATASET"]=no
 }
 
-add_dataset "legacy_tsvs" "daily" "5xx| 5xx-misc  | 5xx-text  
|5xx-upload |api|   edits   |  sampled  |"
 add_dataset "mediacounts" "daily" "   full  | top1000 |"
 add_dataset "pagecounts_all_sites" "hourly" " file name date  |  page   | 
project |"
 add_dataset "pagecounts_raw" "hourly" " file name date  |  page   | project |"
@@ -362,32 +360,6 @@
 local QUERY="SELECT LPAD(ROUND(percent_lost, 1), 5, ' ') FROM 
wmf_raw.webrequest_sequence_stats_hourly WHERE $CONDITIONS;"
 
 echo "$(hive -S -e "$QUERY" 2>/dev/null | tail -n 1)%"
-}
-
-dump_dataset_legacy_tsvs() {
-local DATE="$1"
-
-local SUFFIX=".tsv.log-$(date --utc -d "$DATE 1 hour" +"%Y%m%d").gz"
-
-local BASE
-for BASE in \
-5xx/5xx \
-5xx-misc/5xx-misc \
-5xx-text/5xx-text \
-5xx-upload/5xx-upload \
-api/api-usage \
-edits/edits \
-sampled/sampled-1000 \
-
-do
-local STATUS="X"
-local FILE_ABS="$ARCHIVE_DATA_DIR_ABS/webrequest/$BASE$SUFFIX"
-if [ -e "$FILE_ABS" ]
-then
-STATUS="_"
-fi
-log_no_lf " $STATUS |"
-done
 }
 
 dump_dataset_mediacounts() {
diff --git a/oozie/webrequest/legacy_tsvs/bundle.properties 
b/oozie/webrequest/legacy_tsvs/bundle.properties
deleted file mode 100644
index 07a1818..000
--- a/oozie/webrequest/legacy_tsvs/bundle.properties
+++ /dev/null
@@ -1,83 +0,0 @@
-# Configures a coordinator to generate daily tsvs from webrequests table.
-#
-# Usage:
-# oozie job -run \
-# -config oozie/webrequest/legacy_tsvs/bundle.properties
-#
-# NOTE:  The $oozie_directory must be synced to HDFS so that all relevant
-#.xml files exist there when this job is submitted.
-
-
-name_node  = hdfs://analytics-hadoop
-job_tracker= 
resourcemanager.analytics.eqiad.wmnet:8032
-queue_name = default
-
-# Base path in HDFS to refinery.
-# When submitting this job for production, you should
-# override this to point directly at a deployed
-# directory name, and not the 'symbolic' 'current' directory.
-# E.g.  /wmf/refinery/2015-01-05T17.59.18Z--7bb7f07
-refinery_directory = ${name_node}/wmf/refinery/current
-
-# HDFS path to artifacts that will be used by this job.
-# E.g. refinery-hive.jar should exist here.
-artifacts_directory= ${refinery_directory}/artifacts
-
-# Base path in HDFS to oozie files.
-# Other files will be used relative to this path.
-oozie_directory= ${refinery_directory}/oozie
-
-# HDFS paths to the coordinators to run.
-# All of them are essentially the same coordinator and differ only in the
-#

[MediaWiki-commits] [Gerrit] mediawiki...Wikilog[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: Ice23dbd7f06a8ccdc7b555097153da2b3e94928b
---
M WikilogComment.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikilog 
refs/changes/25/327925/1

diff --git a/WikilogComment.php b/WikilogComment.php
index 41db768..3c9b26e 100644
--- a/WikilogComment.php
+++ b/WikilogComment.php
@@ -148,7 +148,7 @@
$dbr = wfGetDB( DB_SLAVE );
$rev = Revision::loadFromId( $dbr, $this->mCommentRev );
if ( $rev ) {
-   $this->mText = $rev->getText();
+   $this->mText = $rev->getContent();
$this->mTextChanged = false;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice23dbd7f06a8ccdc7b555097153da2b3e94928b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikilog
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageTagging[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I1291b6d952351b3458290f33f70e18ce62221b8f
---
M ImageTaggingHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageTagging 
refs/changes/22/327922/1

diff --git a/ImageTaggingHooks.php b/ImageTaggingHooks.php
index 08aba21..4bfcda9 100644
--- a/ImageTaggingHooks.php
+++ b/ImageTaggingHooks.php
@@ -274,7 +274,7 @@
array( 'known' )
);
$revision = Revision::newFromTitle( $t );
-   $text = $revision->getText();
+   $text = $revision->getContent();
 
$lines = explode( "\n", $text );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1291b6d952351b3458290f33f70e18ce62221b8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageTagging
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...IndexFunction[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: Ie4b990f1f7266e37ad803ad9b9741bfa85edcf62
---
M IndexAbstracts.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/IndexFunction 
refs/changes/23/327923/1

diff --git a/IndexAbstracts.php b/IndexAbstracts.php
index 4082606..4926001 100644
--- a/IndexAbstracts.php
+++ b/IndexAbstracts.php
@@ -99,7 +99,7 @@
$rev = Revision::newFromTitle( $title );
 
if ( $rev ) {
-   $text = substr( $rev->getText(), 0, 16384 );
+   $text = substr( $rev->getContent(), 0, 16384 );
 
// Ok, first note this is a TERRIBLE HACK. :D
//

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4b990f1f7266e37ad803ad9b9741bfa85edcf62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/IndexFunction
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...MadLib[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I0739a747491d901af2bfe0386e64d5e643fc9b9e
---
M MadLib.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MadLib 
refs/changes/24/327924/1

diff --git a/MadLib.php b/MadLib.php
index 3fd430f..a39d07e 100644
--- a/MadLib.php
+++ b/MadLib.php
@@ -201,7 +201,7 @@
 if(is_object($title)) {
 $r = Revision::newFromTitle($title);
 if(is_object($r))
-return $r->getText();
+return $r->getContent();
 }
 return "";
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0739a747491d901af2bfe0386e64d5e643fc9b9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MadLib
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...Checkpoint[master]: Replaced usage of deprecated hook "ArticleSave"

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

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

Change subject: Replaced usage of deprecated hook "ArticleSave"
..


Replaced usage of deprecated hook "ArticleSave"

Replaced usage of deprecated hook "ArticleSave" deprecated in
MediaWiki 1.21, with "PageContentSave"

Bug: T151973
Change-Id: Ied84aeb0821a873bf3b9be56a9ed12f6fd67c318
---
M Checkpoint.php
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/Checkpoint.php b/Checkpoint.php
index ccc49aa..aad8a16 100644
--- a/Checkpoint.php
+++ b/Checkpoint.php
@@ -23,7 +23,7 @@
 $wgExtensionMessagesFiles['Checkpoint'] = dirname( __FILE__ ) . 
'/Checkpoint.i18n.php';
 
 $wgHooks['EditPageBeforeEditButtons'][] = 'efCheckpointButton';
-$wgHooks['ArticleSave'][] = 'efCheckpointSave';
+$wgHooks['PageContentSave'][] = 'efCheckpointSave';
 $wgHooks['GetFullURL'][] = 'efCheckpointReturn';
 
 function efCheckpointButton( &$editpage, &$buttons ) {
@@ -38,7 +38,8 @@
return true;
 }
 
-function efCheckpointSave( $article, $user, $text, &$summary, $minor, $watch, 
$sectionanchor, $flags ) {
+function efCheckpointSave( &$wikiPage, &$user, &$content, &$summary,
+   $isMinor, $isWatch, $section, &$flags, &$status ) {
global $wgRequest;
 
if ( $wgRequest->getCheck( 'wpCheckpoint' ) ) {
@@ -46,8 +47,8 @@
// blank summary, so let's get an automatic one if
// applicable (the appending bit prevents autosummaries
// from appearing otherwise).
-   $oldtext = $article->getContent( Revision::RAW ); // 
current revision
-   $summary = $article->getAutosummary( $oldtext, $text, 
$flags );
+   $old_content = $wikiPage->getContent( Revision::RAW ); 
// current revision
+   $summary = 
$wikiPage->getContentHandler()->getAutosummary( $old_content, $content, $flags 
);
}
$summary .= wfMessage( 'word-separator' )->text() . wfMessage( 
'checkpoint-notice' )->text();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied84aeb0821a873bf3b9be56a9ed12f6fd67c318
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Checkpoint
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Niharika29 
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...ImageTagging[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I7bcb9926a504ad513f6d095ddc8c2835d94e5dab
---
M ImageTaggingHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageTagging 
refs/changes/21/327921/1

diff --git a/ImageTaggingHooks.php b/ImageTaggingHooks.php
index 08aba21..4bfcda9 100644
--- a/ImageTaggingHooks.php
+++ b/ImageTaggingHooks.php
@@ -274,7 +274,7 @@
array( 'known' )
);
$revision = Revision::newFromTitle( $t );
-   $text = $revision->getText();
+   $text = $revision->getContent();
 
$lines = explode( "\n", $text );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bcb9926a504ad513f6d095ddc8c2835d94e5dab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageTagging
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...Awesomeness[master]: Replaced usage of deprecated hook "ArticleSave"

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

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

Change subject: Replaced usage of deprecated hook "ArticleSave"
..


Replaced usage of deprecated hook "ArticleSave"

Replaced usage of deprecated hook "ArticleSave" deprecated in
MediaWiki 1.21, with "PageContentSave"

Bug: T151973
Change-Id: I50803feb6ef4d9d8f924a053498ff5ba959e3882
---
M Awesomeness.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/Awesomeness.php b/Awesomeness.php
index a4e623c..5176dd6 100644
--- a/Awesomeness.php
+++ b/Awesomeness.php
@@ -34,7 +34,8 @@
 $wgMessagesDirs['Awesomeness'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['Awesomeness'] = dirname( __FILE__ ) . 
'/Awesomeness.i18n.php';
 
-$wgHooks['ArticleSave'][] = function ( &$article, &$user, &$text, &$summary, 
$minor, $watch, $sectionanchor, &$flags ) {
+$wgHooks['PageContentSave'][] = function ( &$wikiPage, &$user, &$content, 
&$summary,
+   $isMinor, $isWatch, $section, &$flags, &$status ) {
$awesomeness = array( 'awesomeness', 'awesome' );
 
$awesomeness = array_map(
@@ -45,7 +46,8 @@
);
 
$awesomeness = implode( "|", array_map( "preg_quote", $awesomeness, 
array_fill( 0, count( $awesomeness ), "/" ) ) );
-   $text = preg_replace( 
"/(^|\s|-)((?:{$awesomeness})[\?!\.\,]?)(\s|$)/i", " '''$2''' ", $text );
+   $text = preg_replace( 
"/(^|\s|-)((?:{$awesomeness})[\?!\.\,]?)(\s|$)/i", " '''$2''' ", 
ContentHandler::getContentText( $content ) );
+   $content = ContentHandler::makeContent( $text, $wikiPage->getTitle() );
 
return true;
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50803feb6ef4d9d8f924a053498ff5ba959e3882
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Awesomeness
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Niharika29 
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...GoogleMaps[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I871c3b16f4ecbc8ec5858f4c9afcd11fb874c889
---
M GoogleMaps.body.php
M SpecialGoogleMapsKML.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleMaps 
refs/changes/20/327920/1

diff --git a/GoogleMaps.body.php b/GoogleMaps.body.php
index ea677d1..42147a8 100644
--- a/GoogleMaps.body.php
+++ b/GoogleMaps.body.php
@@ -567,7 +567,7 @@
$revision = is_null($title) ? null :
Revision::newFromTitle($title);
$parsedArticleText = is_null($revision) ? null :
-   self::parseWikiText($pParser, $pLocalParser, 
$revision->getText(), $revision->getTitle(), $pParser->mOptions);
+   self::parseWikiText($pParser, $pLocalParser, 
$revision->getContent(), $revision->getTitle(), $pParser->mOptions);
$titleMaybeNonexistent = is_null($title) ? 
Title::makeTitleSafe(NS_MAIN, $pTitle) : $title;
$titleLink = is_null($titleMaybeNonexistent) ? '' : 
Linker::link($titleMaybeNonexistent);
if (count($pTabs)) {
diff --git a/SpecialGoogleMapsKML.php b/SpecialGoogleMapsKML.php
index 4e3de79..4aff0ee 100644
--- a/SpecialGoogleMapsKML.php
+++ b/SpecialGoogleMapsKML.php
@@ -39,7 +39,7 @@
$localParser = new Parser();
$localParser->startExternalParse( 
$this->getPageTitle(), $popts, Parser::OT_WIKI, true );
 
-   if (preg_match_all("/(.*?)<\/googlemap>/s", $revision->getText(), $matches)) {
+   if (preg_match_all("/(.*?)<\/googlemap>/s", $revision->getContent(), $matches)) {
$exporter->addFileHeader();
for($i=0;$i

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

[MediaWiki-commits] [Gerrit] mediawiki...FirstSteps[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: Ief05d1e48ea3fba9d185430306855027a9987a75
---
M SpecialFirstSteps.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FirstSteps 
refs/changes/19/327919/1

diff --git a/SpecialFirstSteps.php b/SpecialFirstSteps.php
index 49f7c0c..0248f94 100644
--- a/SpecialFirstSteps.php
+++ b/SpecialFirstSteps.php
@@ -255,7 +255,7 @@
 
if ( $userpage->exists() ) {
$revision = Revision::newFromTitle( $userpage );
-   $text = $revision->getText();
+   $text = $revision->getContent();
$preload = $text;
 
if ( preg_match( '/{{#babel:/i', $text ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief05d1e48ea3fba9d185430306855027a9987a75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FirstSteps
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...DebugTemplates[master]: Removed usages of the deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of the deprecated method Revision::getText
..

Removed usages of the deprecated method
Revision::getText

Bug: T151973
Change-Id: I35151660a68f1e9b049c1f1aff16c56ea608aca4
---
M SpecialDebugTemplates.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DebugTemplates 
refs/changes/17/327917/1

diff --git a/SpecialDebugTemplates.php b/SpecialDebugTemplates.php
index b0f2836..9ba3079 100644
--- a/SpecialDebugTemplates.php
+++ b/SpecialDebugTemplates.php
@@ -199,7 +199,7 @@
if ( is_object( $title ) ) {
$r = Revision::newFromTitle( $title );
if ( is_object( $r ) )
-   return $r->getText();
+   return $r->getContent();
}
return "";
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35151660a68f1e9b049c1f1aff16c56ea608aca4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DebugTemplates
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...ExtTab[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I85d7b9df7a16843432121057390fdc30bfef66a0
---
M includes/ET_AjaxAccess.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtTab 
refs/changes/18/327918/1

diff --git a/includes/ET_AjaxAccess.php b/includes/ET_AjaxAccess.php
index 7278481..1c54969 100644
--- a/includes/ET_AjaxAccess.php
+++ b/includes/ET_AjaxAccess.php
@@ -23,7 +23,7 @@
$popts = $wgOut->parserOptions();
$popts->setTidy( true );
$popts->enableLimitReport();
-   $html = $wgParser->parse( $revision->getText(), 
$wgTitle, $popts )->getText();
+   $html = $wgParser->parse( 
$revision->getContent(), $wgTitle, $popts )->getText();
}
return $html;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85d7b9df7a16843432121057390fdc30bfef66a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtTab
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...BiblioPlus[master]: Removed usages of a deprecated method Revision::getText

2016-12-17 Thread LukBukkit (Code Review)

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

Change subject: Removed usages of a deprecated method Revision::getText
..

Removed usages of a deprecated method
Revision::getText

Bug: T151973
Change-Id: I30e698b5b1cbb2faeac5ae399f366e64d7850120
---
M BiblioPlus.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BiblioPlus 
refs/changes/16/327916/1

diff --git a/BiblioPlus.body.php b/BiblioPlus.body.php
index 3c988d6..8cae4e6 100644
--- a/BiblioPlus.body.php
+++ b/BiblioPlus.body.php
@@ -80,7 +80,7 @@
*/
 function fetchPage( $title ) {
 $rev = Revision::newFromTitle( $title );
-return $rev->getText();
+return $rev->getContent();
 }
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30e698b5b1cbb2faeac5ae399f366e64d7850120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BiblioPlus
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug monoversion installation, maintenance

2016-12-17 Thread Seb35 (Code Review)

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

Change subject: Bug monoversion installation, maintenance
..

Bug monoversion installation, maintenance

Bugs:
* Monoversion installation was broken because
  architecture was modified (and it was out-of-tests)

Loading:
* Document it works with MW >= 1.3 instead of >= 1.6
* Added two classes, even if loaded independently

Code:
* Simplify registration of this extension

Change-Id: I906e3b3626077b5af582bb122b52ed9edc60a77f
---
M MediaWikiFarm.php
M extension.json
M src/MediaWikiFarm.php
3 files changed, 17 insertions(+), 20 deletions(-)


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

diff --git a/MediaWikiFarm.php b/MediaWikiFarm.php
index f1c27a4..99e9575 100644
--- a/MediaWikiFarm.php
+++ b/MediaWikiFarm.php
@@ -27,6 +27,6 @@
MediaWikiFarm::load();
 
# Load MediaWiki configuration
-   require_once MediaWikiFarm::getInstance()->getConfigFile();
+   require_once $wgMediaWikiFarm->getConfigFile();
 }
 // @codeCoverageIgnoreEnd
diff --git a/extension.json b/extension.json
index 1ad7552..8a2d26f 100644
--- a/extension.json
+++ b/extension.json
@@ -9,7 +9,7 @@
"url": "https://www.mediawiki.org/wiki/Extension:MediaWikiFarm;,
"type": "other",
"requires": {
-   "MediaWiki": ">= 1.6.0"
+   "MediaWiki": ">= 1.3.0"
},
"config": {
"MediaWikiFarmConfigDir": "/etc/mediawiki",
@@ -28,6 +28,8 @@
},
"AutoloadClasses": {
"MediaWikiFarm": "src/MediaWikiFarm.php",
+   "AbstractMediaWikiFarmScript": 
"src/AbstractMediaWikiFarmScript.php",
+   "MediaWikiFarmScript": "src/MediaWikiFarmScript.php",
"MWFConfigurationException": "src/MediaWikiFarm.php"
},
"manifest_version": 1
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 18e871a..7bdd23c 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -369,11 +369,17 @@
}
}
 
-   # Register this extension MediaWikiFarm to appear in 
Special:Version
-   if( $this->parameters['ExtensionRegistry'] ) {
-   wfLoadExtension( 'MediaWikiFarm', $this->codeDir ? 
$this->farmDir . '/extension.json' : null );
+   # Load extensions with the wfLoadExtension mechanism
+   foreach( $this->configuration['extensions'] as $extension => 
$value ) {
+
+   if( $value == 'wfLoadExtension' ) {
+
+   wfLoadExtension( $extension );
+   }
}
-   else {
+
+   # Register this extension MediaWikiFarm to appear in 
Special:Version
+   if( !$this->parameters['ExtensionRegistry'] ) {
$GLOBALS['wgExtensionCredits']['other'][] = array(
'path' => $this->farmDir . '/MediaWikiFarm.php',
'name' => 'MediaWikiFarm',
@@ -385,18 +391,11 @@
);
 
$GLOBALS['wgAutoloadClasses']['MediaWikiFarm'] = 
'src/MediaWikiFarm.php';
+   
$GLOBALS['wgAutoloadClasses']['AbstractMediaWikiFarmScript'] = 
'src/AbstractMediaWikiFarmScript.php';
+   $GLOBALS['wgAutoloadClasses']['MediaWikiFarmScript'] = 
'src/MediaWikiFarmScript.php';

$GLOBALS['wgAutoloadClasses']['MWFConfigurationException'] = 
'src/MediaWikiFarm.php';
$GLOBALS['wgMessagesDirs']['MediaWikiFarm'] = array( 
'i18n' );
$GLOBALS['wgHooks']['UnitTestsList'][] = array( 
'MediaWikiFarm::onUnitTestsList' );
-   }
-
-   # Load extensions with the wfLoadExtension mechanism
-   foreach( $this->configuration['extensions'] as $extension => 
$value ) {
-
-   if( $value == 'wfLoadExtension' && $extension != 
'MediaWikiFarm' ) {
-
-   wfLoadExtension( $extension );
-   }
}
}
 
@@ -1304,11 +1303,7 @@
$localSettings .= "\n# Extensions\n";
foreach( $configuration['extensions'] as $extension => $loading 
) {
if( $loading == 'wfLoadExtension' ) {
-   if( $extension == 'MediaWikiFarm' ) {
-   $localSettings .= "wfLoadExtension( 
'MediaWikiFarm'" . ( $this->codeDir ? ', ' . var_export( $this->farmDir . 
'/extension.json', true ) : '' ) ." );\n";
-   } else {
-   $localSettings .= "wfLoadExtension( 
'$extension' );\n";
-   }
+   $localSettings .=

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

2016-12-17 Thread WikidataBuilder (Code Review)

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

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

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

Change-Id: I66d55f1b4526047657a8ed27e5c9af6ee95885e5
---
M composer.lock
M extensions/Wikibase/client/config/WikibaseClient.default.php
A extensions/Wikibase/client/includes/DispatchingServiceFactory.php
A extensions/Wikibase/client/includes/DispatchingServiceWiring.php
A extensions/Wikibase/client/includes/Store/RepositoryServiceContainer.php
A extensions/Wikibase/client/includes/Store/RepositoryServiceWiring.php
M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/WikibaseClient.php
A 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceFactoryTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceContainerTest.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/includes/Interactors/TermIndexSearchInteractor.php
M extensions/Wikibase/lib/includes/Store/BufferingTermLookup.php
M extensions/Wikibase/lib/includes/Store/DispatchingTermBuffer.php
A extensions/Wikibase/lib/includes/Store/PrefetchingTermLookup.php
D 
extensions/Wikibase/lib/includes/Store/RepositorySpecificEntityRevisionLookupFactory.php
D 
extensions/Wikibase/lib/tests/phpunit/Store/RepositorySpecificEntityRevisionLookupFactoryTest.php
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/includes/Api/ApiErrorReporter.php
M extensions/Wikibase/repo/includes/Api/GetEntities.php
M extensions/Wikibase/repo/includes/Specials/SpecialNewProperty.php
M extensions/Wikibase/repo/maintenance/dispatchChanges.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/HtmlAssertionHelpers.php
A 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewEntityTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewItemTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialNewPropertyTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
M vendor/data-values/geo/Geo.php
M vendor/data-values/geo/README.md
M vendor/data-values/geo/phpcs.xml
M vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
M vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
36 files changed, 1,424 insertions(+), 526 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index b2e7573..fc0cb3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -285,16 +285,16 @@
 },
 {
 "name": "data-values/geo",
-"version": "1.2.0",
+"version": "1.2.1",
 "source": {
 "type": "git",
 "url": "https://github.com/DataValues/Geo.git;,
-"reference": "b0c635635cf3e25aed8d1d1000e50f893bd3d91c"
+"reference": "4fc2cddbdcef229665e7c2cc52a65688cd3e820d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/DataValues/Geo/zipball/b0c635635cf3e25aed8d1d1000e50f893bd3d91c;,
-"reference": "b0c635635cf3e25aed8d1d1000e50f893bd3d91c",
+"url": 
"https://api.github.com/repos/DataValues/Geo/zipball/4fc2cddbdcef229665e7c2cc52a65688cd3e820d;,
+"reference": "4fc2cddbdcef229665e7c2cc52a65688cd3e820d",
 "shasum": ""
 },
 "require": {
@@ -347,7 +347,7 @@
 "parsers",
 "wikidata"
 ],
-"time": "2016-11-11 19:17:21"
+"time": "2016-12-16 15:11:26"
 },
 {
 "name": "data-values/interfaces",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "974c74a543427b84a8dd35cbf7da6603ccde9a16"
+"reference": "32a8fe6eee79a6c505694e0c2c98ac6384873d0b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/974c74a543427b84a8dd35cbf7da6603ccde9a16;,
-"reference": "974c74a543427b84a8dd35cbf7da6603ccde9a16",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32a8fe6eee79a6c505694e0c2c98ac6384873d0b;,
+"reference":

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove duplicate and unused message keys from api/en.json

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Remove duplicate and unused message keys from api/en.json
..

Remove duplicate and unused message keys from api/en.json

Also move one message to group with other messages.

Change-Id: Ia975eaa0a6c92438529cd5787e0ef54c053b2690
---
M i18n/api/en.json
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/13/327913/1

diff --git a/i18n/api/en.json b/i18n/api/en.json
index 664fe04..238d43c 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -76,13 +76,10 @@
"apihelp-cxsuggestionlist-param-titles": "Page titles.",
"apihelp-cxsuggestionlist-param-from": "The source language code.",
"apihelp-cxsuggestionlist-param-to": "The target language code.",
-   "apihelp-cxsave-description": "This module allows to save draft 
translations by section to save bandwidth and to collect parallel corpora.",
-   "apihelp-cxsave-example-1": "Save the source and translation sections. 
The content must be JSON-encoded string.",
-   "apihelp-cxsave-param-translationid": "The translation ID",
-   "apihelp-cxsave-param-content": "JSON-encoded section data. Each 
section is an object and has the following keys: content, sectionId, 
sequenceId, sequenceId, origin",
"apihelp-query+cxtranslatorstats-description": "Fetch the translation 
statistics for the given user.",
"apihelp-query+cxtranslatorstats-param-translator": "The translator's 
user name. This parameter is optional. If not passed, the currently logged-in 
user will be used.",
"apihelp-query+cxtranslatorstats-example-1": "Fetch the translation 
statistics for the given user.",
+   "apihelp-cxsave-description": "This module allows to save draft 
translations by section to save bandwidth and to collect parallel corpora.",
"apihelp-cxsave-param-sourcerevision": "The revision of the source 
page.",
"apihelp-cxsave-param-progress": "Information about translation 
completion (progress). JSON with the keys any, human, 
mt and mtSectionsCount. The keys' values are 
percentages.",
"apihelp-cxsave-param-content": "JSON-encoded section data. Each 
section is an object and has the following keys: content, sectionId, 
sequenceId, sequenceId, origin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia975eaa0a6c92438529cd5787e0ef54c053b2690
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalCssJs[master]: Remove duplicate message keys in en.json

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Remove duplicate message keys in en.json
..

Remove duplicate message keys in en.json

Change-Id: I1fe3f3bd696f911c3be999e05f47f944e1d20a25
---
M i18n/core/en.json
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs 
refs/changes/12/327912/1

diff --git a/i18n/core/en.json b/i18n/core/en.json
index 74ecfc1..82321c6 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -7,12 +7,9 @@
},
"globalcssjs-extensionname": "Global CSS/JS",
"globalcssjs-desc": "Allows CSS and JavaScript on a central wiki to be 
loaded for all connected wikis",
-   "globalcssjs-warning-js": "Any JavaScript added to this page will be 
loaded on all wikis where you have an account.",
-   "globalcssjs-warning-css": "Any CSS added to this page will be loaded 
on all wikis where you have an account.",
"globalcssjs-custom-css-js": "Shared CSS/JavaScript for all wikis 
([[:mw:Special:MyLanguage/Help:Extension:GlobalCssJs|more information]]):",
"globalcssjs-warning-js": "Any JavaScript added to this page will be 
loaded on all wikis where you have an account (see 
[[mw:Help:Extension:GlobalCssJs|documentation]]).",
"globalcssjs-warning-css": "Any CSS added to this page will be loaded 
on all wikis where you have an account (see 
[[mw:Help:Extension:GlobalCssJs|documentation]]).",
-   "globalcssjs-custom-css-js": "Shared CSS/JavaScript for all wikis:",
"globalcssjs-custom-js": "Custom JavaScript",
"globalcssjs-custom-css": "Custom CSS",
"globalcssjs-delete-css": "Deleting CSS page on {{GENDER:$1|user}} 
request due to deployment of [[mw:Help:Extension:GlobalCssJs]]",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fe3f3bd696f911c3be999e05f47f944e1d20a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalCssJs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Remove duplicate message key from en.json

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Remove duplicate message key from en.json
..

Remove duplicate message key from en.json

Change-Id: Ieb49d6761b88246d227a0696171f661eb3a05e87
---
M i18n/en.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/11/327911/1

diff --git a/i18n/en.json b/i18n/en.json
index b6d9bf4..575186c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,7 +8,6 @@
"pluggableauth-not-authorized": "{{GENDER:$1|User}} $1 not authorized.",
"pluggableauth-authentication-failure": "User cannot be authenticated.",
"pluggableauth-authentication-workflow-failure": "Authentication 
workflow failure.",
-   "pluggableauth-authentication-failure": "Authentication or 
authorization failure.",
"pluggableauth-loginbutton-label": "Log in with PluggableAuth",
"pluggableauth-loginbutton-help": "Authenticates you with PluggableAuth"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb49d6761b88246d227a0696171f661eb3a05e87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikipediaExtracts[master]: Fix invalid json in qqq.json

2016-12-17 Thread Umherirrender (Code Review)

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

Change subject: Fix invalid json in qqq.json
..

Fix invalid json in qqq.json

Change-Id: I55b16fba4aa6d7cefd82549898fa3e9f02af2d31
---
M i18n/qqq.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index af802b5..4d5ca5a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -5,7 +5,7 @@
]
},
"wikipediaextracts-desc": 
"{{desc|name=WikipediaExtracts|url=https://www.mediawiki.org/wiki/Extension:WikipediaExtracts}};,
-   "wikipediaextracts-404": "Error message when an extract is requested of 
a Wikipedia page that doesn't exist"
+   "wikipediaextracts-404": "Error message when an extract is requested of 
a Wikipedia page that doesn't exist",
"wikipediaextracts-invalid-language": "Error message when given an 
invalid language code",
"wikipediaextracts-credits": "Text after the extract, crediting 
Wikipedia"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55b16fba4aa6d7cefd82549898fa3e9f02af2d31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikipediaExtracts
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move TempFileRepo to a separate file

2016-12-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327909 )

Change subject: Move TempFileRepo to a separate file
..

Move TempFileRepo to a separate file

Change-Id: I6fc0870cc82a7b19859abc00bd4b2ecee6c0fc9e
---
M autoload.php
M includes/filerepo/FileRepo.php
A includes/filerepo/TempFileRepo.php
3 files changed, 18 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/327909/1

diff --git a/autoload.php b/autoload.php
index 6dbcc1d..fa04957 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1425,7 +1425,7 @@
'TablePager' => __DIR__ . '/includes/pager/TablePager.php',
'TagLogFormatter' => __DIR__ . '/includes/logging/TagLogFormatter.php',
'TempFSFile' => __DIR__ . 
'/includes/libs/filebackend/fsfile/TempFSFile.php',
-   'TempFileRepo' => __DIR__ . '/includes/filerepo/FileRepo.php',
+   'TempFileRepo' => __DIR__ . '/includes/filerepo/TempFileRepo.php',
'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
'TemplatesOnThisPageFormatter' => __DIR__ . 
'/includes/TemplatesOnThisPageFormatter.php',
'TestFileOpPerformance' => __DIR__ . '/maintenance/fileOpPerfTest.php',
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 41f5281..be37011 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1924,12 +1924,3 @@
return $this->supportsSha1URLs;
}
 }
-
-/**
- * FileRepo for temporary files created via FileRepo::getTempRepo()
- */
-class TempFileRepo extends FileRepo {
-   public function getTempRepo() {
-   throw new MWException( "Cannot get a temp repo from a temp 
repo." );
-   }
-}
diff --git a/includes/filerepo/TempFileRepo.php 
b/includes/filerepo/TempFileRepo.php
new file mode 100644
index 000..aab4a2e
--- /dev/null
+++ b/includes/filerepo/TempFileRepo.php
@@ -0,0 +1,17 @@
+https://gerrit.wikimedia.org/r/327909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fc0870cc82a7b19859abc00bd4b2ecee6c0fc9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add Protect-level-autopatrol in et.json

2016-12-17 Thread Urbanecm (Code Review)

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

Change subject: Add Protect-level-autopatrol in et.json
..

Add Protect-level-autopatrol in et.json

Bug: T153465
Change-Id: Ie9f6d5c934118881fd5c047d82e1e070f6effd2c
---
M i18n/wikimedia/et.json
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/i18n/wikimedia/et.json b/i18n/wikimedia/et.json
index 37412a0..45dcdf7 100644
--- a/i18n/wikimedia/et.json
+++ b/i18n/wikimedia/et.json
@@ -189,6 +189,7 @@
"right-editeditorprotected": "Redigeerida lehekülgi kaitsetasemega 
\"{{int:protect-level-editeditorprotected}}\"",
"protect-level-editeditorprotected": "Lubatud ainult toimetajatele",
"restriction-level-editeditorprotected": "lubatud ainult toimetajatele",
+   "protect-level-autopatrol": "Lubatud vaid usaldatud kasutajatele ja 
administraatoritele",
"wikimedia-feedback-termsofuse": "Nõustun andma tagasisidet vastavalt 
https://wikimediafoundation.org/wiki/Terms_of_Use\; 
target=\"_blank\">kasutustingimustele.",
"wikimedia-globalrenamequeue-email-body-approved": "Kasutaja \"$1\" 
ümbernimetamise taotlus on rahuldatud. Uueks nimeks saab \"$2\". Kui 
nimevahetus on lõpule viidud, saad sisse logida uue kasutajanime ja vana 
parooliga. Aitäh, et oled osalenud Wikimedia projektides.",
"wikimedia-globalrenamequeue-email-body-rejected": "Kasutaja \"$1\" 
ümbernimetamist kasutajaks \"$2\" ei õnnestunud lõpule viia.\n\nMärkus: 
$3\n\nLisateavet leiad siit: 
.
 Oma nimevahetustaotluse kohta saad küsimuse postitada siia: 
. 
Kõigepealt pead endiselt konto praeguse nimega sisse logima.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9f6d5c934118881fd5c047d82e1e070f6effd2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

88 matches

Mail list logo