date:20161113

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw: Depool db2066 for mainteance

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: db-codfw: Depool db2066 for mainteance
..


db-codfw: Depool db2066 for mainteance

Going to import S5 content to dbstore2002 and that needs replication
to be stopped for a few hours.

Bug: T150518
Change-Id: Ia5a7392ec3bc482283effa55e26aab867d3edfa6
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 385b999..1941368 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -132,7 +132,7 @@
'db2045' => 400, # 2.9TB 160GB
'db2052' => 50,  # 2.9TB 160GB, dump (inactive), vslow
'db2059' => 100, # 3.3TB 160GB, api
-   'db2066' => 400, # 3.3TB 160GB
+#  'db2066' => 400, # 3.3TB 160GB  #Temporary maintenance T150518
],
's6' => [
'db2028' => 0,   # 2.9TB  96GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5a7392ec3bc482283effa55e26aab867d3edfa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw: Depool db2066 for mainteance

2016-11-13 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321353

Change subject: db-codfw: Depool db2066 for mainteance
..

db-codfw: Depool db2066 for mainteance

Going to import S5 content to dbstore2002 and that needs replication
to be stopped for a few hours.

Bug: T150518
Change-Id: Ia5a7392ec3bc482283effa55e26aab867d3edfa6
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/53/321353/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 385b999..1941368 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -132,7 +132,7 @@
'db2045' => 400, # 2.9TB 160GB
'db2052' => 50,  # 2.9TB 160GB, dump (inactive), vslow
'db2059' => 100, # 3.3TB 160GB, api
-   'db2066' => 400, # 3.3TB 160GB
+#  'db2066' => 400, # 3.3TB 160GB  #Temporary maintenance T150518
],
's6' => [
'db2028' => 0,   # 2.9TB  96GB, master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5a7392ec3bc482283effa55e26aab867d3edfa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix interpretation of "A-type" password hashes

2016-11-13 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321352

Change subject: Fix interpretation of "A-type" password hashes
..

Fix interpretation of "A-type" password hashes

An A-type hash is an unsalted hash. A B-type hash is a salted hash of
the form md5(salt "-" md5(password)). So it's not correct to have an
A-type hash with a salt. User::comparePasswords() and
CentralAuthUser::getPasswordFromString() already get this right, they
generate :B: prefixes for legacy salted hashes where the salt is not
specified in the database.

Change-Id: Icb809274f9f63641e54daf98332a5646fd58b550
---
M includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
M includes/password/MWOldPassword.php
2 files changed, 3 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/321352/1

diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php 
b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
index 88df68d..b68c368 100644
--- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
@@ -104,7 +104,7 @@
// The old hash format was just an md5 hex hash, with no type 
information
if ( preg_match( '/^[0-9a-f]{32}$/', $row->user_password ) ) {
if ( $this->config->get( 'PasswordSalt' ) ) {
-   $row->user_password = 
":A:{$row->user_id}:{$row->user_password}";
+   $row->user_password = 
":B:{$row->user_id}:{$row->user_password}";
} else {
$row->user_password = 
":A:{$row->user_password}";
}
diff --git a/includes/password/MWOldPassword.php 
b/includes/password/MWOldPassword.php
index 84675c1..360485e 100644
--- a/includes/password/MWOldPassword.php
+++ b/includes/password/MWOldPassword.php
@@ -36,14 +36,8 @@
}
 
public function crypt( $plaintext ) {
-   global $wgPasswordSalt;
-
-   if ( $wgPasswordSalt && count( $this->args ) === 1 ) {
-   $this->hash = md5( $this->args[0] . '-' . md5( 
$plaintext ) );
-   } else {
-   $this->args = [];
-   $this->hash = md5( $plaintext );
-   }
+   $this->args = [];
+   $this->hash = md5( $plaintext );
 
if ( !is_string( $this->hash ) || strlen( $this->hash ) < 32 ) {
throw new PasswordError( 'Error when hashing password.' 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb809274f9f63641e54daf98332a5646fd58b550
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: README.rst: Fixed typo

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: README.rst: Fixed typo
..


README.rst: Fixed typo

Change-Id: I5b27549dcf25a485b546c65b993314e01dc8d00c
---
M README.rst
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/README.rst b/README.rst
index 3260bc4..f9da046 100644
--- a/README.rst
+++ b/README.rst
@@ -92,7 +92,7 @@
 
+---+--+
 
 
-Required external programms
+Required external programs
 ---
 
 It may require the following programs to function properly:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b27549dcf25a485b546c65b993314e01dc8d00c
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Improve wmf-config/ style

2016-11-13 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321351

Change subject: Improve wmf-config/ style
..

Improve wmf-config/ style

This commit has been autogenerated with a mediawiki/tools/code-utils
stylize.php run.

Change-Id: I053917829ae7e74dadd13e7ac4b21cc4d85b5c67
---
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings-labs.php
M wmf-config/FeaturedFeedsWMF.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/StartProfiler.php
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
M wmf-config/db-labs.php
M wmf-config/flaggedrevs.php
M wmf-config/jobqueue-labs.php
M wmf-config/jobqueue.php
M wmf-config/mc-labs.php
M wmf-config/missing.php
M wmf-config/throttle.php
14 files changed, 179 insertions(+), 179 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/51/321351/1

diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index 1463f85..1a4cf6a 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -88,7 +88,7 @@
'codfw' => $wmgCirrusSearchShardCount,
 ];
 
-if (! isset( $wmgCirrusSearchReplicas['eqiad'] ) ) {
+if ( ! isset( $wmgCirrusSearchReplicas['eqiad'] ) ) {
$wgCirrusSearchReplicas = [
'eqiad' => $wmgCirrusSearchReplicas,
'codfw' => $wmgCirrusSearchReplicas,
diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index e3a0f56..d09556c 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -139,10 +139,10 @@
 
 // Labs override for BounceHandler
 if ( $wmgUseBounceHandler ) {
-   //$wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
+   // $wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
$wgBounceHandlerCluster = false;
$wgBounceHandlerSharedDB = false;
-   $wgBounceHandlerInternalIPs = [ '127.0.0.1', '::1', '10.68.17.78' ]; 
//deployment-mx.wmflabs.org
+   $wgBounceHandlerInternalIPs = [ '127.0.0.1', '::1', '10.68.17.78' ]; // 
deployment-mx.wmflabs.org
$wgBounceHandlerUnconfirmUsers = true;
$wgBounceRecordLimit = 5;
$wgVERPdomainPart = 'beta.wmflabs.org';
@@ -153,7 +153,7 @@
"commons" => [
'url' => '//commons.wikimedia.beta.wmflabs.org/w/api.php'
]];
-   $wgEnableTranscode = true; //enable transcoding on labs
+   $wgEnableTranscode = true; // enable transcoding on labs
$wgFFmpegLocation = '/usr/bin/ffmpeg'; // use new ffmpeg build w/ VP9 & 
Opus support
 }
 
diff --git a/wmf-config/FeaturedFeedsWMF.php b/wmf-config/FeaturedFeedsWMF.php
index c63ed08..6451bc0 100644
--- a/wmf-config/FeaturedFeedsWMF.php
+++ b/wmf-config/FeaturedFeedsWMF.php
@@ -1,5 +1,5 @@
  [
-   'default' => [ 'hard' => 0.5, 'soft'=> 0.7 ],
-   'wikipedia' => [ 'hard' => 0.6, 'soft'=> 0.7 ], // 
T127661
+   'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
+   'wikipedia' => [ 'hard' => 0.6, 'soft' => 0.7 ], // 
T127661
],
'wgOresEnabledNamespaces' => [
'default' => [],
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index ad6b11e..c114a75 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -94,7 +94,7 @@
continue;
}
 
-   foreach( $sample['phpStack'] as $frame ) {
+   foreach ( $sample['phpStack'] as $frame ) {
if ( $frame['function'] === 'include' ) {
// For file scope, just use the path as 
the name.
$func = $frame['file'];
diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 385b999..85a20d8 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -5,7 +5,7 @@
define( 'DBO_DEFAULT', 16 );
 }
 
-#$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, 
please try again soon.";
+# $wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, 
please try again soon.";
 
 $wmgParserCacheDBs = [
'10.64.0.12'   => '10.192.16.170', # pc2004
@@ -419,76 +419,76 @@
 # Removing a server from this list does not remove the server from rotation,
 # it just breaks the site horribly.
 'hostsByName' => [
-   'db1001' => '10.64.0.5', #do not remove or comment out
-   'db1009' => '10.64.0.13', #do not remove or comment out
-   'db1011' => '10.64.0.15', #do not remove or comment out
-   'db1015' => '10.64.0.19', #do not remove or comment out
-   'db1018' => '10.64.16.7', #do not remove or comment out
-   'db1020' => '10.64.16.9', #do not remove or

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix whitespace issue

2016-11-13 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321350

Change subject: Fix whitespace issue
..

Fix whitespace issue

Change-Id: I6547ae74925c8291d9650bb59c88599808d3fea8
---
M wmf-config/Wikibase-production.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/50/321350/1

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index e7311e7..6e985dd 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -76,7 +76,7 @@
 
if ( $wgDBname === 'wikidatawiki' ) {
$wgWBRepoSettings['unitStorage'] = [
-   'class' => '\\Wikibase\\Lib\\JsonUnitStorage', 
+   'class' => '\\Wikibase\\Lib\\JsonUnitStorage',
'args' => [__DIR__ . '/unitConversionConfig.json']
];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6547ae74925c8291d9650bb59c88599808d3fea8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] mediawiki...Genealogy[master]: Update git links to new Gerrit repo.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321348

Change subject: Update git links to new Gerrit repo.
..

Update git links to new Gerrit repo.

Change-Id: I980b619145c0ca134118450dc4418501353da15f
---
M README.md
1 file changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Genealogy 
refs/changes/48/321348/1

diff --git a/README.md b/README.md
index c86cfd7..7c9a0b8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 MediaWiki Genealogy extension
 =
 
-All details:
-[mediawiki.org/wiki/Extension:Genealogy](https://mediawiki.org/wiki/Extension:Genealogy)
+All details: https://mediawiki.org/wiki/Extension:Genealogy
 
 
 ## Usage summary
@@ -30,8 +29,7 @@
 ## Templates
 
 **Example:**
-For an example template that makes use of these parser functions,
-see 
[`person_template.wikitext`](https://github.com/samwilson/Genealogy/blob/master/person_template.wikitext)
+For an example template that makes use of these parser functions, see 
`person_template.wikitext`.
 
 **Preload:**
 When this extension creates a link to a page that doesn't yet exist,
@@ -56,12 +54,13 @@
 * `index` — The index of this list-item in the full list, starting from 1. 
 * `count` — The total number of items in the full list.
 
+
 ## Installation
 
 1. Clone the *Genealogy* and *GraphViz* extensions into your extensions 
directory:
```
$ cd extensions
-   $ git clone https://github.com/samwilson/Genealogy.git
+   $ git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Genealogy.git
$ git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GraphViz.git
```
 2. Enable them in your `LocalSettings.php` file:
@@ -78,5 +77,4 @@
 
 You can see this extension in use on [ArchivesWiki](https://archives.org.au).
 
-Please report all bugs via the GitHub issue tracker at
-https://github.com/samwilson/Genealogy/issues
+Please report all bugs via Phabricator: http://phabricator.wikimedia.org/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I980b619145c0ca134118450dc4418501353da15f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...ZoomableImages[master]: extension.json has descriptionmsg but i18n does not exist

2016-11-13 Thread Nephron (Code Review)

Nephron has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321346

Change subject: extension.json has descriptionmsg but i18n does not exist
..

extension.json has descriptionmsg but i18n does not exist

Change-Id: I43b0f0409b8266479b0f8524e5a34f53d8ad2561
---
A i18n/en.json
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZoomableImages 
refs/changes/46/321346/2

diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..b7d4466
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,6 @@
+{
+   "@metadata": {
+   "authors": []
+   },
+   "zoomableimages-desc": "Allows using zoomable images with the 
OpenSeadragon viewer"
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43b0f0409b8266479b0f8524e5a34f53d8ad2561
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZoomableImages
Gerrit-Branch: master
Gerrit-Owner: Nephron 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add Abenaki language (abe) to Wikidata

2016-11-13 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321345

Change subject: Add Abenaki language (abe) to Wikidata
..

Add Abenaki language (abe) to Wikidata

The Abenaki language isn't currently implemented in MediaWiki,
but some items of Wikidata means to use this language for
monolingual properties, for example for place names etymology.

The ISO 639-3 code 'abe' is more adapted, and matches the Western
Abekani.

Autonym sources:
  - English Wikipedia
  - http://www.languagegeek.com/algon/abenaki/abenaki.html

Bug: T150633
Change-Id: I94349bed15aa895d0b92df3bc16be6cbb6532425
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/45/321345/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 617ceba..c04ba7c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16333,6 +16333,7 @@
'rwr' => 'मारवाड़ी',   // T61905
'sje' => 'bidumsámegiella', // T146707
'smj' => 'julevsámegiella', // T146707
+   'abe' => 'wôbanakiôdwawôgan', // T150633
],
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94349bed15aa895d0b92df3bc16be6cbb6532425
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] pywikibot/core[master]: README.rs: Fixed typo

2016-11-13 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321344

Change subject: README.rs: Fixed typo
..

README.rs: Fixed typo

Change-Id: I5b27549dcf25a485b546c65b993314e01dc8d00c
---
M README.rst
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/44/321344/1

diff --git a/README.rst b/README.rst
index 3260bc4..f9da046 100644
--- a/README.rst
+++ b/README.rst
@@ -92,7 +92,7 @@
 
+---+--+
 
 
-Required external programms
+Required external programs
 ---
 
 It may require the following programs to function properly:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b27549dcf25a485b546c65b993314e01dc8d00c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Cosmetic fixes for some helper form classes

2016-11-13 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Cosmetic fixes for some helper form classes
..


Cosmetic fixes for some helper form classes

Change-Id: I95f6a70be9f5166dd69695c6bb4cb42c1b4dd707
---
M specials/PF_CreateCategory.php
M specials/PF_CreateTemplate.php
2 files changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/specials/PF_CreateCategory.php b/specials/PF_CreateCategory.php
index 20dd05e..ee4d6ec 100644
--- a/specials/PF_CreateCategory.php
+++ b/specials/PF_CreateCategory.php
@@ -21,7 +21,6 @@
}
 
static function createCategoryText( $default_form, $category_name, 
$parent_category ) {
-
if ( $default_form === '' ) {
$text = wfMessage( 'pf_category_desc', $category_name 
)->inContentLanguage()->text();
} else {
@@ -82,9 +81,7 @@
 
$all_forms = PFUtils::getAllForms();
 
-   // Set 'title' as hidden field, in case there's no URL niceness
-   global $wgContLang;
-   $mw_namespace_labels = $wgContLang->getNamespaces();
+   // Set 'title' as hidden field, in case there's no URL niceness.
$text = "\t" . '' . "\n";
$firstRow = '';
if ( is_null( $presetCategoryName ) ) {
diff --git a/specials/PF_CreateTemplate.php b/specials/PF_CreateTemplate.php
index 6c81baa..f1bfefb 100644
--- a/specials/PF_CreateTemplate.php
+++ b/specials/PF_CreateTemplate.php
@@ -188,9 +188,10 @@
// appropriate local variables.
foreach ( $req->getValues() as $var => $val ) {
$var_elements = explode( "_", $var );
-   // we only care about query variables of the 
form "a_b"
-   if ( count( $var_elements ) != 2 )
+   // We only care about query variables of the 
form "a_b".
+   if ( count( $var_elements ) != 2 ) {
continue;
+   }
list ( $field_field, $id ) = $var_elements;
if ( $field_field == 'name' && $id != 'starter' 
) {
$field = PFTemplateField::create(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95f6a70be9f5166dd69695c6bb4cb42c1b4dd707
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Cosmetic fixes for some helper form classes

2016-11-13 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321343

Change subject: Cosmetic fixes for some helper form classes
..

Cosmetic fixes for some helper form classes

Change-Id: I95f6a70be9f5166dd69695c6bb4cb42c1b4dd707
---
M specials/PF_CreateCategory.php
M specials/PF_CreateTemplate.php
2 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/43/321343/2

diff --git a/specials/PF_CreateCategory.php b/specials/PF_CreateCategory.php
index 20dd05e..ee4d6ec 100644
--- a/specials/PF_CreateCategory.php
+++ b/specials/PF_CreateCategory.php
@@ -21,7 +21,6 @@
}
 
static function createCategoryText( $default_form, $category_name, 
$parent_category ) {
-
if ( $default_form === '' ) {
$text = wfMessage( 'pf_category_desc', $category_name 
)->inContentLanguage()->text();
} else {
@@ -82,9 +81,7 @@
 
$all_forms = PFUtils::getAllForms();
 
-   // Set 'title' as hidden field, in case there's no URL niceness
-   global $wgContLang;
-   $mw_namespace_labels = $wgContLang->getNamespaces();
+   // Set 'title' as hidden field, in case there's no URL niceness.
$text = "\t" . '' . "\n";
$firstRow = '';
if ( is_null( $presetCategoryName ) ) {
diff --git a/specials/PF_CreateTemplate.php b/specials/PF_CreateTemplate.php
index 6c81baa..f1bfefb 100644
--- a/specials/PF_CreateTemplate.php
+++ b/specials/PF_CreateTemplate.php
@@ -188,9 +188,10 @@
// appropriate local variables.
foreach ( $req->getValues() as $var => $val ) {
$var_elements = explode( "_", $var );
-   // we only care about query variables of the 
form "a_b"
-   if ( count( $var_elements ) != 2 )
+   // We only care about query variables of the 
form "a_b".
+   if ( count( $var_elements ) != 2 ) {
continue;
+   }
list ( $field_field, $id ) = $var_elements;
if ( $field_field == 'name' && $id != 'starter' 
) {
$field = PFTemplateField::create(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95f6a70be9f5166dd69695c6bb4cb42c1b4dd707
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Avoid annotation set clones when unused

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Avoid annotation set clones when unused
..


Avoid annotation set clones when unused

Change-Id: I374ec3510344fcafa54a4bc8fe556d9db76a2ce8
---
M src/dm/ve.dm.AnnotationSet.js
M src/dm/ve.dm.Converter.js
2 files changed, 44 insertions(+), 40 deletions(-)

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



diff --git a/src/dm/ve.dm.AnnotationSet.js b/src/dm/ve.dm.AnnotationSet.js
index af61201..ec03595 100644
--- a/src/dm/ve.dm.AnnotationSet.js
+++ b/src/dm/ve.dm.AnnotationSet.js
@@ -36,7 +36,7 @@
  * @return {ve.dm.AnnotationSet} Copy of annotation set
  */
 ve.dm.AnnotationSet.prototype.clone = function () {
-   return new ve.dm.AnnotationSet( this.getStore(), 
this.storeIndexes.slice( 0 ) );
+   return new ve.dm.AnnotationSet( this.getStore(), 
this.storeIndexes.slice() );
 };
 
 /**
diff --git a/src/dm/ve.dm.Converter.js b/src/dm/ve.dm.Converter.js
index a94ad72..5371b65 100644
--- a/src/dm/ve.dm.Converter.js
+++ b/src/dm/ve.dm.Converter.js
@@ -87,49 +87,53 @@
// Close annotations as needed
// Go through annotationStack from bottom to top (low to high),
// and find the first annotation that's not in annotations.
-   targetSetOpen = targetSet.clone();
-   for ( i = 0, len = currentSet.getLength(); i < len; i++ ) {
-   index = currentSet.getIndex( i );
-   // containsComparableForSerialization is expensive,
-   // so do a simple contains check first
-   if (
-   targetSetOpen.containsIndex( index ) ||
-   targetSetOpen.containsComparableForSerialization( 
currentSet.get( i ) )
-   ) {
-   targetSetOpen.removeIndex( index );
-   } else {
-   startClosingAt = i;
-   break;
+   if ( currentSet.getLength() ) {
+   targetSetOpen = targetSet.clone();
+   for ( i = 0, len = currentSet.getLength(); i < len; i++ ) {
+   index = currentSet.getIndex( i );
+   // containsComparableForSerialization is expensive,
+   // so do a simple contains check first
+   if (
+   targetSetOpen.containsIndex( index ) ||
+   
targetSetOpen.containsComparableForSerialization( currentSet.get( i ) )
+   ) {
+   targetSetOpen.removeIndex( index );
+   } else {
+   startClosingAt = i;
+   break;
+   }
}
-   }
-   if ( startClosingAt !== undefined ) {
-   // Close all annotations from top to bottom (high to low)
-   // until we reach startClosingAt
-   for ( i = currentSet.getLength() - 1; i >= startClosingAt; i-- 
) {
-   close( currentSet.get( i ) );
-   // Remove from currentClone
-   currentSet.removeAt( i );
+   if ( startClosingAt !== undefined ) {
+   // Close all annotations from top to bottom (high to 
low)
+   // until we reach startClosingAt
+   for ( i = currentSet.getLength() - 1; i >= 
startClosingAt; i-- ) {
+   close( currentSet.get( i ) );
+   // Remove from currentClone
+   currentSet.removeAt( i );
+   }
}
}
 
-   currentSetOpen = currentSet.clone();
-   // Open annotations as needed
-   for ( i = 0, len = targetSet.getLength(); i < len; i++ ) {
-   index = targetSet.getIndex( i );
-   // containsComparableForSerialization is expensive,
-   // so do a simple contains check first
-   if (
-   currentSetOpen.containsIndex( index ) ||
-   currentSetOpen.containsComparableForSerialization( 
targetSet.get( i ) )
-   ) {
-   // If an annotation is already open remove it from the 
currentSetOpen list
-   // as it may exist multiple times in the targetSet, and 
so may need to be
-   // opened again
-   currentSetOpen.removeIndex( index );
-   } else {
-   open( targetSet.get( i ) );
-   // Add to currentClone
-   currentSet.pushIndex( index );
+   if ( targetSet.getLength() ) {
+   currentSetOpen = currentSet.clone();
+   // Open annotations as needed
+   for ( i = 0, len =

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for RL for datepicker for MW 1.26

2016-11-13 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321342

Change subject: Fix for RL for datepicker for MW 1.26
..

Fix for RL for datepicker for MW 1.26

Change-Id: If8b33a2304a698dc84ee4a6e0149d6e00aef2ba2
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/42/321342/2

diff --git a/extension.json b/extension.json
index 6d6b3f7..13867a7 100644
--- a/extension.json
+++ b/extension.json
@@ -264,7 +264,8 @@
"dependencies": [
"jquery.ui.datepicker",
"ext.pageforms.main"
-   ]
+   ],
+   "position": "bottom"
},
"ext.pageforms.regexp": {
"scripts": "libs/PF_regexp.js",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8b33a2304a698dc84ee4a6e0149d6e00aef2ba2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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...PageForms[master]: Fix for handling non-comma delimiters

2016-11-13 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Fix for handling non-comma delimiters
..


Fix for handling non-comma delimiters

Change-Id: Ibfbe7d094d3ea1bd57907f5de6259ac28848d078
---
M includes/PF_FormField.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/includes/PF_FormField.php b/includes/PF_FormField.php
index 56f1b57..461cf6b 100644
--- a/includes/PF_FormField.php
+++ b/includes/PF_FormField.php
@@ -308,9 +308,8 @@
}
} // end for
 
-
if ( !array_key_exists( 'delimiter', $f->mFieldArgs ) ) {
-   $f->mFieldArgs['delimiter'] = ",";
+   $f->mFieldArgs['delimiter'] = 
$f->getTemplateField()->getDelimiter();
}
$delimiter = $f->mFieldArgs['delimiter'];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfbe7d094d3ea1bd57907f5de6259ac28848d078
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Fix for handling non-comma delimiters

2016-11-13 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321341

Change subject: Fix for handling non-comma delimiters
..

Fix for handling non-comma delimiters

Change-Id: Ibfbe7d094d3ea1bd57907f5de6259ac28848d078
---
M includes/PF_FormField.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/41/321341/2

diff --git a/includes/PF_FormField.php b/includes/PF_FormField.php
index 56f1b57..461cf6b 100644
--- a/includes/PF_FormField.php
+++ b/includes/PF_FormField.php
@@ -308,9 +308,8 @@
}
} // end for
 
-
if ( !array_key_exists( 'delimiter', $f->mFieldArgs ) ) {
-   $f->mFieldArgs['delimiter'] = ",";
+   $f->mFieldArgs['delimiter'] = 
$f->getTemplateField()->getDelimiter();
}
$delimiter = $f->mFieldArgs['delimiter'];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfbe7d094d3ea1bd57907f5de6259ac28848d078
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add Genealogy extension with standard testing templates

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321340

Change subject: Add Genealogy extension with standard testing templates
..

Add Genealogy extension with standard testing templates

The Genealogy extension has phpunit tests, and will soon have i18n
files and javascript etc. This change adds the standard extension
testing project templates.

Change-Id: Ieb1e813a12b158c61359b7b4abfdd66e2970320c
---
M zuul/layout.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/321340/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9504a09..fb523f6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3403,6 +3403,12 @@
   - jsonlint
   - jshint
 
+  - name: mediawiki/extensions/Genealogy
+template:
+  - name: extension-unittests-generic
+  - name: jshint
+  - name: npm
+
   - name: mediawiki/extensions/GeoCrumbs
 template:
   - name: jshint

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb1e813a12b158c61359b7b4abfdd66e2970320c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Move around a load more logging, responses etc.

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Move around a load more logging, responses etc.
..


Move around a load more logging, responses etc.

Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
---
M src/relay.js
1 file changed, 15 insertions(+), 18 deletions(-)

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



diff --git a/src/relay.js b/src/relay.js
index c534981..dac448a 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -177,15 +177,13 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
-
-ircClient.say(to, "re-connecting to gerrit");
-
 if (sshConn) {
 sshConn.end();
+logging.info('re-connecting to gerrit..');
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
 } else {
 ircClient.say(to, "Permission is denied.");
 }
@@ -195,32 +193,31 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "Re-connecting to Gerrit and IRC.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from IRC.');
 
 ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
-
 if (sshConn) {
 sshConn.end();
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
 
-logging.info('re-connected to gerrit.');
+setTimeout(function(){ ircClient.say(to, "re-connected to 
Gerrit and IRC."); }, 17000); // TODO: wtf?
 
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
+logging.info('Re-connecting to IRC.');
 } else {
 ircClient.say(to, "Permission is denied.");
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (text.indexOf(ircClient.nick + ': nick') === 0) {
 if (!from_trusted) {
 ircClient.say(to, "Permission is denied.");
-} else if (config.nick.indexOf(ircClient.nick) === 0) {
+} else if (config.nick === ircClient.nick) {
 console.log(from + ' => ' + to  + ' ' + text);
 
 ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
@@ -234,11 +231,11 @@
 if (ircClient.pass) {
 ircClient.pass(config.password);
 }
-logging.info('changed nick to' + ' ' + config.nick);
+logging.info('Changed nick to ' + config.nick);
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'help') === 0) {
+if (text.indexOf(ircClient.nick + ': help') === 0) {
ircClient.say(to, "My current commands are: " + ircClient.nick 
+ ": restart" + ", " + ircClient.nick  + ": force-restart" + ", " + " and " + 
ircClient.nick + ": nick");
 }
 } catch (err) {}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Merlijn van Deen 
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...Genealogy[master]: Beginnings of a tree-drawing system (with GraphViz).

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: Beginnings of a tree-drawing system (with GraphViz).
..


Beginnings of a tree-drawing system (with GraphViz).

Change-Id: If783bc530f0fd1e152871863be62cd7655282532
---
M Core.php
M Genealogy.i18n.php
M Genealogy.php
M Person.php
M README.md
A Traverser.php
A Tree.php
7 files changed, 197 insertions(+), 9 deletions(-)

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



diff --git a/Core.php b/Core.php
index ba5b80d..9ecc40a 100644
--- a/Core.php
+++ b/Core.php
@@ -47,7 +47,7 @@
break;
case 'parent':
$parentTitle = Title::newFromText($params[0]);
-   if ($parentTitle->exists()) {
+   if ($parentTitle and $parentTitle->exists()) {
$person = new 
GenealogyPerson($parentTitle);
$out .= $person->getWikiLink();
} else {
@@ -71,6 +71,19 @@
$person = new 
GenealogyPerson($parser->getTitle());
$out .= 
self::PeopleList($person->getChildren());
break;
+   case 'tree':
+   $tree = new GenealogyTree();
+   if (isset($params['ancestors'])) {
+   $tree->addAncestors(explode("\n", 
$params['ancestors']));
+   }
+   //$tree->setAncestorDepth($params['ancestor 
depth']);
+   if (isset($params['descendants'])) {
+   $tree->addDescendants(explode("\n", 
$params['descendants']));
+   }
+   //$tree->setDescendantDepth($params['descendant 
depth']);
+   $graphviz = $tree->getGraphviz();
+   $out .= 
$parser->recursiveTagParse("\n$graphviz\n");
+   break;
default:
$out .= ''
. 'Genealogy parser function type not 
recognised: "' . $type . '".'
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 07784f9..44c2ba8 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -13,6 +13,10 @@
  * @author Sam Wilson 
  */
 $messages['en'] = array(
-   'genealogy' => "Genealogy",
+   'genealogy'  => "Genealogy",
'genealogy-desc' => "Adds a parser function for easier linking between 
genealogical records",
+   'ancestor'   => 'Ancestor',
+   'descendant' => 'Descendant',
+   'ancestors'  => 'Ancestors',
+   'descendants'=> 'Descendants',
 );
diff --git a/Genealogy.php b/Genealogy.php
index 49e8308..9c1f17d 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -34,13 +34,13 @@
 $wgExtensionMessagesFiles['GenealogyMagic'] = __DIR__ . 
'/Genealogy.i18n.magic.php';
 
 /**
- * Class loading and the Special page
+ * Class loading
  */
-$wgAutoloadClasses['Genealogy'] = __FILE__;
-$wgAutoloadClasses['GenealogyPerson'] = __DIR__ . '/Person.php';
-$wgAutoloadClasses['GenealogySpecial'] = __DIR__ . '/Special.php';
-$wgAutoloadClasses['GenealogyCore'] = __DIR__ . '/Core.php';
-$wgSpecialPages['Genealogy'] = 'GenealogySpecial';
+$wgAutoloadClasses['GenealogyPerson']= __DIR__ . '/Person.php';
+$wgAutoloadClasses['GenealogySpecial']   = __DIR__ . '/Special.php';
+$wgAutoloadClasses['GenealogyCore']  = __DIR__ . '/Core.php';
+$wgAutoloadClasses['GenealogyTree']  = __DIR__ . '/Tree.php';
+$wgAutoloadClasses['GenealogyTraverser'] = __DIR__ . '/Traverser.php';
 
 /**
  * Parser function
diff --git a/Person.php b/Person.php
index 33ebabe..e3e4c9f 100644
--- a/Person.php
+++ b/Person.php
@@ -19,6 +19,15 @@
}
 
/**
+* Get some basic info about this person.
+* @todo Add dates.
+* @return string
+*/
+   public function __toString() {
+   return $this->getTitle()->getPrefixedText();
+   }
+
+   /**
 * Get this person's wiki title.
 *
 * @return Title
diff --git a/README.md b/README.md
index 6412e98..e3d98e1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 Its first two parameters are unnamed (i.e. don't have equals signs), but all
 others must be (dates, etc.).
 
-The following functions are supported, three for defining data and three for
+The following functions are supported, three for defining data and four for
 reporting data:
 
 1. Define this person's dates.
@@ -21,6 +21,9 @@
`{{#genealogy:partners}}`
 6. List all children:
`{{#genealogy:children}}`
+7. Display a tree (a connected graph):
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bump scap version to 3.3.1-1

2016-11-13 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321339

Change subject: Bump scap version to 3.3.1-1
..

Bump scap version to 3.3.1-1

Change-Id: I0f65bd55c0a80cc38a41792217425a2b752810e8
---
M modules/scap/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/321339/1

diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 11b6847..6f4004a 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -12,7 +12,7 @@
 class scap (
 $deployment_server = 'deployment',
 $wmflabs_master = 'deployment-tin.eqiad.wmflabs',
-$version = '3.3.0-1',
+$version = '3.3.1-1',
 ) {
 package { 'scap':
 ensure => $version,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f65bd55c0a80cc38a41792217425a2b752810e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Switch to using page properties for storage.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: Switch to using page properties for storage.
..


Switch to using page properties for storage.

Change-Id: Ie781804312cd92332220b66539ba5d08e818f0d8
---
M Genealogy.php
M Person.php
M README.md
3 files changed, 156 insertions(+), 77 deletions(-)

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



diff --git a/Genealogy.php b/Genealogy.php
index b85f2e6..5dfaae5 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -72,16 +72,19 @@
switch ($type) {
case 'person':
$out .= 'b.'.$params['birth date'];
+   GenealogySaveProp($parser, 'birth date', $params['birth 
date'], FALSE);
break;
case 'parent':
$out .= "[[".$params[0]."]]";
+   GenealogySaveProp($parser, 'parent', $params[0]);
break;
case 'siblings':
$person = new GenealogyPerson($parser->getTitle());
$out .= GenealogyPeopleList($person->getSiblings());
break;
case 'partner':
-   $out .= "[[".$params[0]."]]";
+   //$out .= "[[".$params[0]."]]";
+   GenealogySaveProp($parser, 'partner', $params[0]);
break;
case 'partners':
$person = new GenealogyPerson($parser->getTitle());
@@ -100,6 +103,19 @@
return $out;
 }
 
+function GenealogySaveProp($parser, $prop, $val, $multi = TRUE) {
+   if ($multi) {
+   $propNum = 1;
+   while ($par = $parser->getOutput()->getProperty("genealogy 
$prop $propNum")
+   AND $par != $val) {
+   $propNum++;
+   }
+   $parser->getOutput()->setProperty("genealogy $prop $propNum", 
$val);
+   } else {
+   $parser->getOutput()->setProperty("genealogy $prop", $val);
+   }
+}
+
 /**
  * Get a wikitext list of people.
  * @todo Replace with a proper templating system.
diff --git a/Person.php b/Person.php
index 42b5647..c8bfb81 100644
--- a/Person.php
+++ b/Person.php
@@ -2,6 +2,7 @@
 
 class GenealogyPerson {
 
+   /** @var Title */
private $title;
 
private $parents;
@@ -31,7 +32,7 @@
 * @return boolean
 */
public function hasDates() {
-   return $this->getBirthDate()!==FALSE;
+   return $this->getBirthDate() !== FALSE;
}
 
/**
@@ -41,16 +42,12 @@
 * @return string
 */
public function getBirthDate() {
-   $pattern = '/{{\#'.$this->magicRegex.':\s*person.*birth 
date=([^|}]*)/';
-   preg_match_all($pattern, $this->getText(), $matches);
-   if (!isset($matches[1][0])) {
-   return FALSE;
-   }
-   $time = strtotime($matches[1][0]);
-   if ($time!==FALSE) {
+   $birthDate = $this->getPropSingle('birth date');
+   $time = strtotime($birthDate);
+   if ($time !== FALSE) {
return date('j F Y', $time);
} else {
-   return $matches[1][0];
+   return $birthDate;
}
}
 
@@ -63,15 +60,7 @@
if (is_array($this->parents)) {
return $this->parents;
}
-   $this->parents = array();
-   $pattern = 
'/{{\#'.$this->magicRegex.':\s*parent\s*\|\s*([^|}]*)/';
-   preg_match_all($pattern, $this->getText(), $matches);
-   if (isset($matches[1])) {
-   foreach ($matches[1] as $match) {
-   $parentTitle = Title::newFromText($match);
-   
$this->parents[$parentTitle->getPrefixedDBkey()] = new 
GenealogyPerson($parentTitle);
-   }
-   }
+   $this->parents = $this->getPropMulti('parent');
return $this->parents;
}
 
@@ -102,7 +91,11 @@
if (is_array($this->partners)) {
return $this->partners;
}
-   $this->partners = $this->whatLinksHere('partner');
+   $this->partners = array_merge(
+   $this->getPropInbound('partner'),
+   $this->getPropMulti('partner')
+   );
+   //unset($this->partners[$this->title->getPrefixedDBkey()]);
return $this->partners;
}
 
@@ -115,75 +108,145 @@
if (is_array($this->children)) {
return $this->children;
}
-   $this->children = array();
-   $prefexedTitle =

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Move core functions to their own class, add Composer support...

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: Move core functions to their own class, add Composer support, 
and fix dates and links.
..


Move core functions to their own class, add Composer support, and fix dates and 
links.

Change-Id: I2b43f32028d76bbaa2a75158553d495588b5e0e7
---
A Core.php
M Genealogy.i18n.php
M Genealogy.php
M Person.php
A composer.json
5 files changed, 190 insertions(+), 151 deletions(-)

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



diff --git a/Core.php b/Core.php
new file mode 100644
index 000..ba5b80d
--- /dev/null
+++ b/Core.php
@@ -0,0 +1,110 @@
+setFunctionHook('genealogy', 
'GenealogyCore::RenderParserFunction');
+   return true;
+   }
+
+   /**
+* Render the output of the parser function.
+* The input parameters are wikitext with templates expanded.
+* The output should be wikitext too.
+*
+* @param Parser $parser
+* @param string $type
+* @param string $param2
+* @param string $param3
+* @return string The wikitext with which to replace the parser 
function call.
+*/
+   static function RenderParserFunction(Parser $parser) {
+   $params = array();
+   $args = func_get_args();
+   array_shift($args); // Remove $parser
+   $type = array_shift($args); // Get param 1, the function type
+   foreach ($args as $arg) { // Everything that's left must be 
named
+   $pair = explode('=', $arg, 2);
+   if (count($pair) == 2) {
+   $name = trim($pair[0]);
+   $value = trim($pair[1]);
+   $params[$name] = $value;
+   } else {
+   $params[] = $arg;
+   }
+   }
+   $out = ''; //"".print_r($params, true)."";
+   switch ($type) {
+   case 'person':
+   if (isset($params['birth date'])) {
+   $out .= 'b.' . $params['birth 
date'];
+   self::SaveProp($parser, 'birth date', 
$params['birth date'], false);
+   }
+   if (isset($params['death date'])) {
+   $out .= 'd.' . $params['death 
date'];
+   self::SaveProp($parser, 'death date', 
$params['death date'], false);
+   }
+   break;
+   case 'parent':
+   $parentTitle = Title::newFromText($params[0]);
+   if ($parentTitle->exists()) {
+   $person = new 
GenealogyPerson($parentTitle);
+   $out .= $person->getWikiLink();
+   } else {
+   $out .= "[[" . $params[0] . "]]";
+   }
+   self::SaveProp($parser, 'parent', $params[0]);
+   break;
+   case 'siblings':
+   $person = new 
GenealogyPerson($parser->getTitle());
+   $out .= 
self::PeopleList($person->getSiblings());
+   break;
+   case 'partner':
+   //$out .= "[[".$params[0]."]]";
+   self::SaveProp($parser, 'partner', $params[0]);
+   break;
+   case 'partners':
+   $person = new 
GenealogyPerson($parser->getTitle());
+   $out .= 
self::PeopleList($person->getPartners());
+   break;
+   case 'children':
+   $person = new 
GenealogyPerson($parser->getTitle());
+   $out .= 
self::PeopleList($person->getChildren());
+   break;
+   default:
+   $out .= ''
+   . 'Genealogy parser function type not 
recognised: "' . $type . '".'
+   . '';
+   break;
+   }
+   return $out;
+   }
+
+   static function SaveProp($parser, $prop, $val, $multi = true) {
+   if ($multi) {
+   $propNum = 1;
+   while ($par = 
$parser->getOutput()->getProperty("genealogy $prop $propNum")
+   and $par != $val) {
+   $propNum++;
+

[MediaWiki-commits] [Gerrit] mediawiki...Html2Wiki[master]: Make html2wiki-summary an actual summary

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Make html2wiki-summary an actual summary
..


Make html2wiki-summary an actual summary

Bug: T136288
Change-Id: I9328aaa90c59593abcede854d26de2c3197a0c0c
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index a796bc6..e5f1840 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
"html2wiki-desc": "Import HTML content into your wiki",
"html2wiki-dry-run": "Dry run:",
"html2wiki-dry-run-heading": "Preview only! Contents were not saved:",
-   "html2wiki-summary": "Description appearing on top of 
[[Special:Html2Wiki]] - but it's not.",
+   "html2wiki-summary": "Import HTML pages into the wiki",
"html2wiki-importbtn": "Import",
"html2wiki-intro": "Use this form to import HTML content into your 
wiki.\n\nIf you upload a zip file, the Collection Name field is used to 
differentiate the collection from a later version. Also all files will be 
grouped in a category by the same name. For example, let's say you're importing 
a collection of HTML files output from your software documentation system, you 
would enter a unique Collection ID like 'FluxCapacitor-v1.1' so that the whole 
collection is imported into an article hierarchy starting with 
'FluxCapacitor-v1.1'. This way 10 different collections can be imported without 
clobbering each other.\n\nSpecifying an existing Collection Name (or parent 
path) will update existing wiki content.\n\nIf you want to import a single file 
into an existing article hierarchy, simply specify it's 'parent' as the 
Collection Name.\n\nFor example, if importing a new 'advanced_topics.html' that 
should exist at 'FluxCapacitor-v1.1/docs/advanced_topics.html', 
the parent would be 'FluxCapacitor-v1.1/docs/'",
"html2wiki-title": "Import HTML",
@@ -25,4 +25,4 @@
"html2wiki_uploaderror": "There was an error handling the file 
upload:\n$1",
"html2wiki_parse-error": "QueryPath (http://querypath.org/) was unable 
to parse the supplied content at $1",
"logentry-html2wiki": "$1 {{GENDER:$2|imported}} page $3"
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9328aaa90c59593abcede854d26de2c3197a0c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Html2Wiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Freephile 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Simplify command handling section

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Simplify command handling section
..


Simplify command handling section

Change-Id: I2871437dac136130365089dfbefab27c47f747f7
---
M src/relay.js
1 file changed, 44 insertions(+), 42 deletions(-)

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



diff --git a/src/relay.js b/src/relay.js
index 2c51552..c534981 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -171,69 +171,71 @@
 
 ircClient.whois(from, function(info){
 try {
-var command_restart = text.indexOf(ircClient.nick + ': ' + 
'restart') === 0;
-var command_force_restart = text.indexOf(ircClient.nick + ': ' + 
'force-restart') === 0;
-var command_nick = text.indexOf(ircClient.nick + ': ' + 'nick') 
=== 0;
 var from_trusted = info.host ? info.host.match(whitelist_cloaks) : 
false;
-var using_intended_nick = config.nick.indexOf(ircClient.nick) === 
0;
 
-if (command_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-ircClient.say(to, "re-connecting to gerrit");
+ircClient.say(to, "re-connecting to gerrit");
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+ircClient.say(to, "reconnected to gerrit");
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
-} else if (command_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_force_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "re-connecting to gerrit and irc.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from irc.');
 
-ircClient.send('QUIT', "quit");
+ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+logging.info('re-connected to gerrit.');
+
+setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
+
+logging.info('re-connected to irc.');
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-logging.info('re-connected to gerrit.');
-
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
-} else if (command_force_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_nick && from_trusted && using_intended_nick) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (!from_trusted) {
+ircClient.say(to, "Permission is denied.");
+} else if (config.nick.indexOf(ircClient.nick) === 0) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "Nick is already " + ircClient.nick + " not 
changing the nick.");
-} else if (command_nick && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
+} else {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('Changing nick');
+logging.info('Changing nick');
 
-ircClient.send('NICK', config.nick);
+ircClient.send('NICK', config.nick);
 
-if (ircClient.pass) {
-

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: In command handling section, use 4-space indentation (like t...

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: In command handling section, use 4-space indentation (like the 
rest of the code) and rename variables
..


In command handling section, use 4-space indentation (like the rest of the 
code) and rename variables

Change-Id: I5e465147b825179e09ae9783f3cd139621545e1c
---
M src/relay.js
1 file changed, 49 insertions(+), 53 deletions(-)

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



diff --git a/src/relay.js b/src/relay.js
index 8f40d87..2c51552 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -170,79 +170,75 @@
 var whitelist_cloaks = 
/^((mediawiki|wikimedia|wikipedia|wiktionary|wikiquote|wikisource|wikispecies|wikibooks|wikinews|wikiversity|wikivoyage|wikidata|wikimedia-commons)\/|fsf\/member\/marktraceur$)/g;
 
 ircClient.whois(from, function(info){
-  try {
+try {
+var command_restart = text.indexOf(ircClient.nick + ': ' + 
'restart') === 0;
+var command_force_restart = text.indexOf(ircClient.nick + ': ' + 
'force-restart') === 0;
+var command_nick = text.indexOf(ircClient.nick + ': ' + 'nick') 
=== 0;
+var from_trusted = info.host ? info.host.match(whitelist_cloaks) : 
false;
+var using_intended_nick = config.nick.indexOf(ircClient.nick) === 
0;
 
-var $irc_nick_restart = text.indexOf(ircClient.nick + ': ' + 
'restart') === 0;
-var $irc_nick_force_restart = text.indexOf(ircClient.nick + ': ' + 
'force-restart') === 0;
-var $irc_nick_nick = text.indexOf(ircClient.nick + ': ' + 'nick') === 
0;
-var $irc_nick_help = text.indexOf(ircClient.nick + ': ' + 'help') === 
0;
-var $irc_nick1;
-var $irc_nick2 = config.nick.indexOf(ircClient.nick) >= 0;
+if (command_restart && from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-$irc_nick1 = info.host ? info.host.match(whitelist_cloaks) : false;
+logging.info('re-connecting to gerrit..');
 
-if ($irc_nick_restart && $irc_nick1) {
-console.log(from + ' => ' + to  + ' ' + text);
+ircClient.say(to, "re-connecting to gerrit");
 
-logging.info('re-connecting to gerrit..');
+if (sshConn) {
+sshConn.end();
+}
 
-ircClient.say(to, "re-connecting to gerrit");
-
-if (sshConn) {
-sshConn.end();
+ircClient.say(to, "reconnected to gerrit");
+} else if (command_restart && !from_trusted) {
+   ircClient.say(to, "Permission is denied.");
 }
 
-ircClient.say(to, "reconnected to gerrit");
-} else if ($irc_nick_restart && !$irc_nick1) {
-   ircClient.say(to, "Permission is denied.");
-}
+if (command_force_restart && from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-if ($irc_nick_force_restart && $irc_nick1) {
-console.log(from + ' => ' + to  + ' ' + text);
+ircClient.say(to, "re-connecting to gerrit and irc.");
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+logging.info('Disconnecting from irc.');
 
-logging.info('Disconnecting from irc.');
+ircClient.send('QUIT', "quit");
 
-ircClient.send('QUIT', "quit");
+logging.info('re-connecting to gerrit..');
 
-logging.info('re-connecting to gerrit..');
+if (sshConn) {
+sshConn.end();
+}
 
-if (sshConn) {
-sshConn.end();
+logging.info('re-connected to gerrit.');
+
+setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
+
+logging.info('re-connected to irc.');
+} else if (command_force_restart && !from_trusted) {
+   ircClient.say(to, "Permission is denied.");
 }
 
-logging.info('re-connected to gerrit.');
+if (command_nick && from_trusted && using_intended_nick) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-setTimeout(function(){ ircClient.say(to, "re-connected to gerrit 
and irc."); }, 17000);
+ircClient.say(to, "Nick is already " + ircClient.nick + " not 
changing the nick.");
+} else if (command_nick && from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connected to irc.');
-} else if ($irc_nick_force_restart && !$irc_nick1) {
-   ircClient.say(to, "Permission is denied.");
-}
+logging.info('Changing nick');
 
-if ($irc_nick_nick && $irc_nick1 && $irc_nick2) {
-

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Move around a load more logging, responses etc.

2016-11-13 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321338

Change subject: Move around a load more logging, responses etc.
..

Move around a load more logging, responses etc.

Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
---
M src/relay.js
1 file changed, 15 insertions(+), 18 deletions(-)


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

diff --git a/src/relay.js b/src/relay.js
index c534981..dac448a 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -177,15 +177,13 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
-
-ircClient.say(to, "re-connecting to gerrit");
-
 if (sshConn) {
 sshConn.end();
+logging.info('re-connecting to gerrit..');
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
 } else {
 ircClient.say(to, "Permission is denied.");
 }
@@ -195,32 +193,31 @@
 if (from_trusted) {
 console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "Re-connecting to Gerrit and IRC.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from IRC.');
 
 ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
-
 if (sshConn) {
 sshConn.end();
+ircClient.say(to, "Ended SSH connection to Gerrit.");
+} else {
+ircClient.say(to, "No SSH connection to Gerrit.");
 }
 
-logging.info('re-connected to gerrit.');
+setTimeout(function(){ ircClient.say(to, "re-connected to 
Gerrit and IRC."); }, 17000); // TODO: wtf?
 
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
+logging.info('Re-connecting to IRC.');
 } else {
 ircClient.say(to, "Permission is denied.");
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (text.indexOf(ircClient.nick + ': nick') === 0) {
 if (!from_trusted) {
 ircClient.say(to, "Permission is denied.");
-} else if (config.nick.indexOf(ircClient.nick) === 0) {
+} else if (config.nick === ircClient.nick) {
 console.log(from + ' => ' + to  + ' ' + text);
 
 ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
@@ -234,11 +231,11 @@
 if (ircClient.pass) {
 ircClient.pass(config.password);
 }
-logging.info('changed nick to' + ' ' + config.nick);
+logging.info('Changed nick to ' + config.nick);
 }
 }
 
-if (text.indexOf(ircClient.nick + ': ' + 'help') === 0) {
+if (text.indexOf(ircClient.nick + ': help') === 0) {
ircClient.say(to, "My current commands are: " + ircClient.nick 
+ ": restart" + ", " + ircClient.nick  + ": force-restart" + ", " + " and " + 
ircClient.nick + ": nick");
 }
 } catch (err) {}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ec5e06b53716d822b106f2fbbfb37e876c3499a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
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] labs...grrrit[master]: Simplify command handling section

2016-11-13 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321337

Change subject: Simplify command handling section
..

Simplify command handling section

Change-Id: I2871437dac136130365089dfbefab27c47f747f7
---
M src/relay.js
1 file changed, 44 insertions(+), 42 deletions(-)


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

diff --git a/src/relay.js b/src/relay.js
index 2c51552..c534981 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -171,69 +171,71 @@
 
 ircClient.whois(from, function(info){
 try {
-var command_restart = text.indexOf(ircClient.nick + ': ' + 
'restart') === 0;
-var command_force_restart = text.indexOf(ircClient.nick + ': ' + 
'force-restart') === 0;
-var command_nick = text.indexOf(ircClient.nick + ': ' + 'nick') 
=== 0;
 var from_trusted = info.host ? info.host.match(whitelist_cloaks) : 
false;
-var using_intended_nick = config.nick.indexOf(ircClient.nick) === 
0;
 
-if (command_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-ircClient.say(to, "re-connecting to gerrit");
+ircClient.say(to, "re-connecting to gerrit");
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+ircClient.say(to, "reconnected to gerrit");
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-ircClient.say(to, "reconnected to gerrit");
-} else if (command_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_force_restart && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'force-restart') === 0) {
+if (from_trusted) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "re-connecting to gerrit and irc.");
+ircClient.say(to, "re-connecting to gerrit and irc.");
 
-logging.info('Disconnecting from irc.');
+logging.info('Disconnecting from irc.');
 
-ircClient.send('QUIT', "quit");
+ircClient.send('QUIT', "quit");
 
-logging.info('re-connecting to gerrit..');
+logging.info('re-connecting to gerrit..');
 
-if (sshConn) {
-sshConn.end();
+if (sshConn) {
+sshConn.end();
+}
+
+logging.info('re-connected to gerrit.');
+
+setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
+
+logging.info('re-connected to irc.');
+} else {
+ircClient.say(to, "Permission is denied.");
 }
-
-logging.info('re-connected to gerrit.');
-
-setTimeout(function(){ ircClient.say(to, "re-connected to 
gerrit and irc."); }, 17000);
-
-logging.info('re-connected to irc.');
-} else if (command_force_restart && !from_trusted) {
-   ircClient.say(to, "Permission is denied.");
 }
 
-if (command_nick && from_trusted && using_intended_nick) {
-console.log(from + ' => ' + to  + ' ' + text);
+if (text.indexOf(ircClient.nick + ': ' + 'nick') === 0) {
+if (!from_trusted) {
+ircClient.say(to, "Permission is denied.");
+} else if (config.nick.indexOf(ircClient.nick) === 0) {
+console.log(from + ' => ' + to  + ' ' + text);
 
-ircClient.say(to, "Nick is already " + ircClient.nick + " not 
changing the nick.");
-} else if (command_nick && from_trusted) {
-console.log(from + ' => ' + to  + ' ' + text);
+ircClient.say(to, "Nick is already " + ircClient.nick + " 
not changing the nick.");
+} else {
+console.log(from + ' => ' + to  + ' ' + text);
 
-logging.info('Changing nick');
+logging.info('Changing nick');
 
-ircClient.send('NICK', config.nick);
+ircClient.send('NICK', config.nick);
 
-

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Remove whitelist_nicks

2016-11-13 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321335

Change subject: Remove whitelist_nicks
..

Remove whitelist_nicks

The users intended to be allowed by this list are all eligible for cloaks,
which require actual authentication and can therefore be trusted.
This couldn't.

Change-Id: I3e24f40f19f4e9902688b4a39b0b8aacc85938ea
---
M src/relay.js
1 file changed, 1 insertion(+), 10 deletions(-)


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

diff --git a/src/relay.js b/src/relay.js
index af57f11..8f40d87 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -169,11 +169,6 @@
 ircClient.addListener('message', function (from, to, text) {
 var whitelist_cloaks = 
/^((mediawiki|wikimedia|wikipedia|wiktionary|wikiquote|wikisource|wikispecies|wikibooks|wikinews|wikiversity|wikivoyage|wikidata|wikimedia-commons)\/|fsf\/member\/marktraceur$)/g;
 
-var whitelist_nicks = [
-"twentyafterfour",
-"thcipriani"
-];
-
 ircClient.whois(from, function(info){
   try {
 
@@ -184,11 +179,7 @@
 var $irc_nick1;
 var $irc_nick2 = config.nick.indexOf(ircClient.nick) >= 0;
 
-if (info.host) {
-$irc_nick1 = (info.host.match(whitelist_cloaks) || 
whitelist_nicks.indexOf(from) >= 0);
-} else {
-$irc_nick1 = whitelist_nicks.indexOf(from) >= 0;
-}
+$irc_nick1 = info.host ? info.host.match(whitelist_cloaks) : false;
 
 if ($irc_nick_restart && $irc_nick1) {
 console.log(from + ' => ' + to  + ' ' + text);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e24f40f19f4e9902688b4a39b0b8aacc85938ea
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
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]: Limit the number of password attempts performed from each IP

2016-11-13 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321334

Change subject: Limit the number of password attempts performed from each IP
..

Limit the number of password attempts performed from each IP

The number of password attempts one can perform is otherwise virtually
unlimited, provided there are enough accounts to try:
https://www.mediawiki.org/wiki/Requests_for_comment/Passwords#Threats

Those who set $wgPasswordAttemptThrottle probably expect it to behave
similarly to $wgRateLimits, where limits mostly depend on the performer
rather than the target and where unregistered users have most actions
throttled by default (including mailpassword).

In a normal scenario, a person with a given IP attempts to login only
to one account, not multiple at once. There can be multiple users who
share the same IP (e.g. in a NAT) and login at once, but it is unlikely
that they all forgot their password. An attacker trying to exhaust the
password attempts would only affect himself in a realistic scenari. An attacker 
trying to exhaust the
password attempts would only affect himself in a realistic scenario..

Bug: T122164
Change-Id: I900c13b9beda6ce66e7b84e1244cdafdf4095890
---
M includes/auth/Throttler.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/321334/1

diff --git a/includes/auth/Throttler.php b/includes/auth/Throttler.php
index f47c606..984af98 100644
--- a/includes/auth/Throttler.php
+++ b/includes/auth/Throttler.php
@@ -128,10 +128,15 @@
 
$throttleKey = wfGlobalCacheKey( 'throttler', 
$this->type, $index, $ipKey, $userKey );
$throttleCount = $this->cache->get( $throttleKey );
+   $throttleIp = wfGlobalCacheKey( 'throttler', 
$this->type, $index, $ip );
+   $throttleIpCount = $this->cache->get( $throttleIp );
 
+   if ( !$throttleIpCount ) {  // counter not started yet
+   $this->cache->add( $throttleIp, 1, $expiry );
+   }
if ( !$throttleCount ) {  // counter not started yet
$this->cache->add( $throttleKey, 1, $expiry );
-   } elseif ( $throttleCount < $count ) { // throttle 
limited not yet reached
+   } elseif ( $throttleCount < $count && $throttleIpCount 
< $count ) { // throttle limited not yet reached
$this->cache->incr( $throttleKey );
} else { // throttled
$this->logRejection( [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I900c13b9beda6ce66e7b84e1244cdafdf4095890
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Add fsf/member/marktraceur to cloak whitelist regex

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add fsf/member/marktraceur to cloak whitelist regex
..


Add fsf/member/marktraceur to cloak whitelist regex

Bug: T149689
Change-Id: Icfd0ccc7627f425a9f25ce423a46e9d3e8744332
---
M src/relay.js
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  Paladox: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/src/relay.js b/src/relay.js
index 5b72b5c..af57f11 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -167,10 +167,9 @@
 }
 ircClient.addListener('join', waitForChannelJoins);
 ircClient.addListener('message', function (from, to, text) {
-var whitelist_cloaks = 
/(mediawiki|wikimedia|wikipedia|wiktionary|wikiquote|wikisource|wikispecies|wikibooks|wikinews|wikiversity|wikivoyage|wikidata|wikimedia-commons)\/*/g;
+var whitelist_cloaks = 
/^((mediawiki|wikimedia|wikipedia|wiktionary|wikiquote|wikisource|wikispecies|wikibooks|wikinews|wikiversity|wikivoyage|wikidata|wikimedia-commons)\/|fsf\/member\/marktraceur$)/g;
 
 var whitelist_nicks = [
-"marktraceur",
 "twentyafterfour",
 "thcipriani"
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfd0ccc7627f425a9f25ce423a46e9d3e8744332
Gerrit-PatchSet: 3
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Peachey88 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [logo] HD for hywiki

2016-11-13 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321237

Change subject: [logo] HD for hywiki
..

[logo] HD for hywiki

Bug: T150620
Change-Id: I79c979953f8f9fdb1bf87976429e4738f5b6f1a1
---
A static/images/project-logos/hywiki-1.5x.png
A static/images/project-logos/hywiki-2x.png
M wmf-config/InitialiseSettings.php
3 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/37/321237/1

diff --git a/static/images/project-logos/hywiki-1.5x.png 
b/static/images/project-logos/hywiki-1.5x.png
new file mode 100644
index 000..64f9e18
--- /dev/null
+++ b/static/images/project-logos/hywiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/hywiki-2x.png 
b/static/images/project-logos/hywiki-2x.png
new file mode 100644
index 000..d3f337d
--- /dev/null
+++ b/static/images/project-logos/hywiki-2x.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 617ceba..822bc7c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1153,6 +1153,7 @@
'fawiki' => [ '1.5x' => '/static/images/project-logos/fawiki-1.5x.png', 
'2x' => '/static/images/project-logos/fawiki-2x.png' ],
'frwiki' => [ '1.5x' => '/static/images/project-logos/frwiki-1.5x.png', 
'2x' => '/static/images/project-logos/frwiki-2x.png' ],
'hewiki' => [ '1.5x' => '/static/images/project-logos/hewiki-1.5x.png', 
'2x' => '/static/images/project-logos/hewiki-2x.png' ], // T145017
+   'hywiki' => [ '1.5x' => '/static/images/project-logos/hywiki-1.5x.png', 
'2x' => '/static/images/project-logos/hywiki-2x.png' ], // T150620
'ilowiki' => [ '1.5x' => 
'/static/images/project-logos/ilowiki-1.5x.png', '2x' => 
'/static/images/project-logos/ilowiki-2x.png' ],
'itwiki' => [ '1.5x' => '/static/images/project-logos/itwiki-1.5x.png', 
'2x' => '/static/images/project-logos/itwiki-2x.png' ],
'jamwiki' => [ '1.5x' => 
'/static/images/project-logos/jamwiki-1.5x.png', '2x' => 
'/static/images/project-logos/jamwiki-2x.png' ], // T134017

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c979953f8f9fdb1bf87976429e4738f5b6f1a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [logo] HD for cebwiki

2016-11-13 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321234

Change subject: [logo] HD for cebwiki
..

[logo] HD for cebwiki

Bug: T150616
Change-Id: I6f83ac7a50e0a4900209ac75e3a57bcac2889c5e
---
A static/images/project-logos/cebwiki-1.5x.png
A static/images/project-logos/cebwiki-2x.png
M wmf-config/InitialiseSettings.php
3 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/34/321234/1

diff --git a/static/images/project-logos/cebwiki-1.5x.png 
b/static/images/project-logos/cebwiki-1.5x.png
new file mode 100644
index 000..713faf1
--- /dev/null
+++ b/static/images/project-logos/cebwiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/cebwiki-2x.png 
b/static/images/project-logos/cebwiki-2x.png
new file mode 100644
index 000..713faf1
--- /dev/null
+++ b/static/images/project-logos/cebwiki-2x.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 617ceba..7ed1cc8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1146,6 +1146,7 @@
 'wgLogoHD' => [
 # Wikipedia
'bnwiki' => [ '1.5x' => '/static/images/project-logos/bnwiki-1.5x.png', 
'2x' => '/static/images/project-logos/bnwiki-2x.png' ],
+   'cebwiki' => [ '1.5x' => 
'/static/images/project-logos/cebwiki-1.5x.png', '2x' => 
'/static/images/project-logos/cebwiki-2x.png' ], // T150616
'cswiki' => [ '1.5x' => '/static/images/project-logos/cswiki-1.5x.png', 
'2x' => '/static/images/project-logos/cswiki-2x.png' ], // T130392
'enwiki' => [ '1.5x' => '/static/images/project-logos/enwiki-1.5x.png', 
'2x' => '/static/images/project-logos/enwiki-2x.png' ],
'dawiki' => [ '1.5x' => '/static/images/project-logos/dawiki-1.5x.png', 
'2x' => '/static/images/project-logos/dawiki-2x.png' ], // T131033

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f83ac7a50e0a4900209ac75e3a57bcac2889c5e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

[MediaWiki-commits] [Gerrit] mediawiki...Patroller[master]: Replace removed ChangesList::newFromUser function

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Replace removed ChangesList::newFromUser function
..


Replace removed ChangesList::newFromUser function

newFromUser() was removed during commit 94083 for MediaWiki 1.23.

Change-Id: I37c9ae531b466fa7347e8ee98731a0b2981997c1
---
M Patroller.php
M SpecialPatroller.php
M extension.json
3 files changed, 27 insertions(+), 27 deletions(-)

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



diff --git a/Patroller.php b/Patroller.php
index d3ca513..dd02b45 100644
--- a/Patroller.php
+++ b/Patroller.php
@@ -27,23 +27,23 @@
'name'  => 'Patroller',
'descriptionmsg'=> 'patrol-desc',
'author'=> 'Rob Church, Kris Blair (Cblair91)',
-   'version'   => '2.0',
+   'version'   => '2.0.1',
'url'   => 
'https://www.mediawiki.org/wiki/Extension:Patroller',
'licence-name'  => 'GPL-2.0'
 ];
 
-# Register hooks
+// Register hooks
 $wgAutoloadClasses['PatrollerHooks']   = __DIR__ . 
'/Patroller.hooks.php';
 $wgAutoloadClasses['SpecialPatroller'] = 
__DIR__ . '/SpecialPatroller.php';
 
 $wgHooks['LoadExtensionSchemaUpdates'][]   = 
'PatrollerHooks::onLoadExtensionSchemaUpdates';
 $wgSpecialPages['Patrol']  = 
'SpecialPatroller';
 
-# Register messages
+// Register messages
 $wgMessagesDir['Patroller']= 
__DIR__ . '/i18n';
 $wgExtensionMessagesFiles['PatrollerAlias']= __DIR__ . 
'/Patroller.alias.php';
 
-# Register rights
+// Register rights
 $wgAvailableRights[]   = 
'patroller';
 $wgGroupPermissions['sysop']['patroller']  = true;
 $wgGroupPermissions['patroller']['patroller']  = true;
diff --git a/SpecialPatroller.php b/SpecialPatroller.php
index 41faa70..257ce26 100644
--- a/SpecialPatroller.php
+++ b/SpecialPatroller.php
@@ -36,27 +36,27 @@
 
$this->setHeaders();
 
-   # Check permissions
+   // Check permissions
if ( !$wgUser->isAllowed( 'patroller' ) ) {
throw new PermissionsError( 'patroller' );
}
 
-   # Keep out blocked users
+   // Keep out blocked users
if ( $wgUser->isBlocked() ) {
throw new UserBlockedError( $wgUser->getBlock() );
}
 
-   # Prune old assignments if needed
+   // Prune old assignments if needed
if ( 0 == mt_rand( 0, 499 ) ) {
$this->pruneAssignments();
}
 
-   # See if something needs to be done
+   // See if something needs to be done
if ( $wgRequest->wasPosted() && $wgUser->matchEditToken( 
$wgRequest->getText( 'wpToken' ) ) ) {
$rcid = $wgRequest->getIntOrNull( 'wpRcId' );
if ( $rcid ) {
if ( $wgRequest->getCheck( 'wpPatrolEndorse' ) 
) {
-   # Mark the change patrolled
+   // Mark the change patrolled
if ( !$wgUser->isBlocked( false ) ) {
RecentChange::markPatrolled( 
$rcid );
$wgOut->setSubtitle( 
wfMessages( 'patrol-endorsed-ok' )->escaped() );
@@ -64,19 +64,19 @@
$wgOut->setSubtitle( 
wgMessages( 'patrol-endorsed-failed' )->escaped() );
}
} elseif ( $wgRequest->getCheck( 
'wpPatrolRevert' ) ) {
-   # Revert the change
+   // Revert the change
$edit = $this->loadChange( $rcid );
$msg = $this->revert( $edit, 
$this->revertReason( $wgRequest ) ) ? 'ok' : 'failed';
$wgOut->setSubtitle( wgMessage( 
'patrol-reverted-' . $msg )->escaped() );
} elseif ( $wgRequest->getCheck( 'wpPatrolSkip' 
) ) {
-   # Do nothing
+   // Do nothing
$wgOut->setSubtitle( wgMessage( 
'patrol-skipped-ok' )->escaped() );
}
}
}
 
-   # If a token was passed, but the check box value was not, then 
the user
-

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add @group tags to phpunit tests

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add @group tags to phpunit tests
..


Add @group tags to phpunit tests

* also fix spelling and remove unused imports

Change-Id: I11cb005a43405aeb4b885128c6d167d4c4c21954
---
M tests/unit/ClusterSettingsTest.php
M tests/unit/CompletionSuggesterTest.php
M tests/unit/ConnectionTest.php
M tests/unit/ElasticaErrorHandlerTest.php
M tests/unit/HooksTest.php
M tests/unit/IndexFieldsTest.php
M tests/unit/InterwikiSearcherTest.php
M tests/unit/Job/MassIndexTest.php
M tests/unit/LanguageDetectTest.php
M tests/unit/Query/BoostTemplatesFeatureTest.php
M tests/unit/Query/FileFeatureTest.php
M tests/unit/Query/FullTextQueryStringQueryBuilder.php
M tests/unit/Query/GeoFeatureTest.php
M tests/unit/Query/HasTemplateFeatureTest.php
M tests/unit/Query/InCategoryFeatureTest.php
M tests/unit/Query/InTitleFeatureTest.php
M tests/unit/Query/MoreLikeFeatureTest.php
M tests/unit/Query/PreferRecentFeatureTest.php
M tests/unit/Query/SimpleKeywordFeatureTest.php
M tests/unit/RequestLoggerTest.php
M tests/unit/RescoreBuilderTest.php
M tests/unit/Search/EscaperTest.php
M tests/unit/Search/FiltersTest.php
M tests/unit/Search/ResultTest.php
M tests/unit/Search/ResultsTypeTest.php
M tests/unit/Search/SearchFieldsTest.php
M tests/unit/SearchConfigTest.php
M tests/unit/SearcherTest.php
M tests/unit/SuggestBuilderTest.php
M tests/unit/SuggestScoringTest.php
M tests/unit/UserTestingTest.php
M tests/unit/UtilTest.php
32 files changed, 86 insertions(+), 6 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  DCausse: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/unit/ClusterSettingsTest.php 
b/tests/unit/ClusterSettingsTest.php
index 0e297d6..0a28c49 100644
--- a/tests/unit/ClusterSettingsTest.php
+++ b/tests/unit/ClusterSettingsTest.php
@@ -2,6 +2,9 @@
 
 namespace CirrusSearch;
 
+/**
+ * @group CirrusSearch
+ */
 class ClusterSettingsTest extends \PHPUnit_Framework_TestCase {
 
public static function provideShardCount() {
diff --git a/tests/unit/CompletionSuggesterTest.php 
b/tests/unit/CompletionSuggesterTest.php
index 7373204..8d416f2 100644
--- a/tests/unit/CompletionSuggesterTest.php
+++ b/tests/unit/CompletionSuggesterTest.php
@@ -23,6 +23,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @group CirrusSearch
  */
 class CompletionSuggesterTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/tests/unit/ConnectionTest.php b/tests/unit/ConnectionTest.php
index f72cc5e..9740b45 100644
--- a/tests/unit/ConnectionTest.php
+++ b/tests/unit/ConnectionTest.php
@@ -22,6 +22,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @group CirrusSearch
  */
 class ConnectionTest extends PHPUnit_Framework_TestCase {
/**
diff --git a/tests/unit/ElasticaErrorHandlerTest.php 
b/tests/unit/ElasticaErrorHandlerTest.php
index 070ad2e..d0d27d6 100644
--- a/tests/unit/ElasticaErrorHandlerTest.php
+++ b/tests/unit/ElasticaErrorHandlerTest.php
@@ -2,6 +2,9 @@
 
 namespace CirrusSearch;
 
+/**
+ * @group CirrusSearch
+ */
 class ElasticaErrorHandlerTest extends \PHPUnit_Framework_TestCase {
 
public static function provideExceptions() {
diff --git a/tests/unit/HooksTest.php b/tests/unit/HooksTest.php
index 2302392..f007bc2 100644
--- a/tests/unit/HooksTest.php
+++ b/tests/unit/HooksTest.php
@@ -21,6 +21,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @group CirrusSearch
  */
 class HooksTest extends PHPUnit_Framework_TestCase {
public function testHooksAreArrays() {
diff --git a/tests/unit/IndexFieldsTest.php b/tests/unit/IndexFieldsTest.php
index c7de4a8..34cff26 100644
--- a/tests/unit/IndexFieldsTest.php
+++ b/tests/unit/IndexFieldsTest.php
@@ -2,6 +2,9 @@
 
 use MediaWiki\MediaWikiServices;
 
+/**
+ * @group CirrusSearch
+ */
 class IndexFieldsTest extends MediaWikiTestCase {
 
public function getTypes() {
@@ -49,4 +52,4 @@
$this->assertEquals( $type, $field->getIndexType() );
$this->assertEquals( "test$typeName", $field->getName() );
}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/InterwikiSearcherTest.php 
b/tests/unit/InterwikiSearcherTest.php
index b6a7085..b7dd05d 100644
--- a/tests/unit/InterwikiSearcherTest.php
+++ b/tests/unit/InterwikiSearcherTest.php
@@ -3,11 +3,12 @@
 namespace CirrusSearch;
 
 use CirrusSearch;
-use CirrusSearch\Test\HashSearchConfig;
-use FauxRequest;
 use RequestContext;
 use Title;
 
+/**
+

[MediaWiki-commits] [Gerrit] mediawiki...EditUser[master]: Make action-edituser-exempt compatible with permissionserror...

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Make action-edituser-exempt compatible with 
permissionserrorstext-withaction
..


Make action-edituser-exempt compatible with permissionserrorstext-withaction

Bug: T136287
Change-Id: I33d40b04d9995f41ab827b6374fe44ece6601b84
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index e5f9f7e..646376c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,5 +14,5 @@
"right-edituser": "Edit the preferences of other users",
"right-edituser-exempt": "Others cannot edit this user's preferences",
"action-edituser": "edit the preferences of other users",
-   "action-edituser-exempt": "others cannot edit this user's preferences"
+   "action-edituser-exempt": "edit the preferences of this user"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b3fb5d0..eaaa0a3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,5 +19,5 @@
"right-edituser": "{{doc-right|edituser}}",
"right-edituser-exempt": "{{doc-right|edituser-exempt}}",
"action-edituser": "{{doc-action|edituser}}",
-   "action-edituser-exempt": "{{doc-action|edituser-exempt}}"
+   "action-edituser-exempt": "Error presented when trying to edit the 
preferences of a user for which this special feature is not 
available.\n\n{{doc-action|edituser-exempt}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33d40b04d9995f41ab827b6374fe44ece6601b84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditUser
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statsv: use systemd's process watchdog

2016-11-13 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321231

Change subject: statsv: use systemd's process watchdog
..

statsv: use systemd's process watchdog

This is the companion change to Ie471fa762b.
It should be deployed after that change.

Change-Id: I01b0e885d371dc019f4d60346feed41aae773e46
---
M modules/webperf/files/statsv.service
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/webperf/files/statsv.service 
b/modules/webperf/files/statsv.service
index 356d056..20300e0 100644
--- a/modules/webperf/files/statsv.service
+++ b/modules/webperf/files/statsv.service
@@ -7,6 +7,7 @@
 ExecStart=/usr/bin/python /srv/deployment/statsv/statsv/statsv.py
 User=nobody
 Restart=always
+WatchdogSec=5
 
 [Install]
 WantedBy=multi-user.target

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b0e885d371dc019f4d60346feed41aae773e46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] analytics/statsv[master]: Use systemd's process watchdog to trigger restarts

2016-11-13 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321230

Change subject: Use systemd's process watchdog to trigger restarts
..

Use systemd's process watchdog to trigger restarts

I3ad8bb49ce was supposed to take care of the problem of statsv getting
stuck and not receiving incoming messages, but it didn't. The traceback
in T150359 makes it clear that there is a bug in pykafka that makes it
handle Kafka restarts poorly.

So instead, rely on systemd's process watchdog functionality to make
sure statsv is terminated (and restarted) if no messages are received in
some span of time, determined by the value of 'WatchdogSec=' in the
service unit's file.

See
https://www.freedesktop.org/software/systemd/man/systemd.service.html#WatchdogSec=
and
https://www.freedesktop.org/software/systemd/man/sd_notify.html#
for more info.

Change-Id: Ie471fa762b6f52f6114aec36a89094ddc76eb77c
---
M statsv.py
1 file changed, 49 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/statsv 
refs/changes/30/321230/1

diff --git a/statsv.py b/statsv.py
index 1917bfa..969b9ee 100644
--- a/statsv.py
+++ b/statsv.py
@@ -26,6 +26,7 @@
 import json
 import logging
 import multiprocessing
+import os
 import re
 import socket
 import urlparse
@@ -48,6 +49,53 @@
 'kafka1020.eqiad.wmnet:9092',
 'kafka1022.eqiad.wmnet:9092',
 )))
+
+SOCK_CLOEXEC = getattr(socket, 'SOCK_CLOEXEC', 0x8)
+
+
+class Watchdog:
+"""
+Simple notifier for systemd's process watchdog.
+
+You can use this in message- or request-processing scripts that are
+managed by systemd and that are under constant load, where the
+absence of work is an abnormal condition.
+
+Make sure the unit file contains `WatchdogSec=1` (or some other
+value) and `Restart=always`. Then you can write something like:
+
+watchdog = Watchdog()
+while 1:
+handle_request()
+watchdog.notify()
+
+This way, if the script spends a full second without handling a
+request, systemd will restart it.
+
+See 
https://www.freedesktop.org/software/systemd/man/systemd.service.html#WatchdogSec=
+for more details about systemd's watchdog capabilities.
+"""
+
+def __init__(self):
+# Get and clear NOTIFY_SOCKET from the environment to prevent
+# subprocesses from inheriting it.
+self.addr = os.environ.pop('NOTIFY_SOCKET', None)
+if not self.addr:
+self.sock = None
+return
+
+# If the first character of NOTIFY_SOCKET is "@", the string is
+# understood as an abstract socket address.
+if self.addr.startswith('@'):
+self.addr = '\0' + self.addr[1:]
+
+self.sock = socket.socket(
+socket.AF_UNIX, socket.SOCK_DGRAM | SOCK_CLOEXEC)
+
+def notify(self):
+if not self.sock:
+return
+self.sock.sendto(b'WATCHDOG=1', self.addr)
 
 
 def process_queue(q):
@@ -90,6 +138,7 @@
 for message in consumer:
 if message is not None:
 queue.put(message.value)
+watchdog.notify()
 
 # If we reach this line, TIMEOUT_SECONDS elapsed with no events received.
 queue.close()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie471fa762b6f52f6114aec36a89094ddc76eb77c
Gerrit-PatchSet: 1
Gerrit-Project: analytics/statsv
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] mediawiki...ZoomableImages[master]: Adding composer.json as per suggestion and coding standard

2016-11-13 Thread Nephron (Code Review)

Nephron has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321229

Change subject: Adding composer.json as per suggestion and coding standard
..

Adding composer.json as per suggestion and coding standard

Change-Id: Ifccc86e66429bad6453d672f5db0e6732fa2db55
---
A composer.json
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZoomableImages 
refs/changes/29/321229/2

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..f66ca74
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,27 @@
+{
+   "name": "ZoomableImages",
+   "description": "Allows using zoomable images with the OpenSeadragon 
viewer",
+   "license": "GPL-2.0+",
+   "authors": [
+   {
+   "name": "Michael Bonert (AKA Nephron)",
+   "email": "michael.bon...@utoronto.ca"
+   }
+   ],
+   "require": {
+   "php": ">=5.6.14"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ],
+   "fix": [
+   "phpcbf"
+   ]
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifccc86e66429bad6453d672f5db0e6732fa2db55
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZoomableImages
Gerrit-Branch: master
Gerrit-Owner: Nephron 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] Update help doc for compat2core script

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: [DOC] Update help doc for compat2core script
..


[DOC] Update help doc for compat2core script

maintenance folder is used by the pwb wrapper since I02ed7a5e533e
thus the folder name may be omitted.

Change-Id: I8dde07e75c9e93d2a1bf2d28e1befe0d06d15f0d
---
M scripts/maintenance/compat2core.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scripts/maintenance/compat2core.py 
b/scripts/maintenance/compat2core.py
index de59ee0..f14d343 100755
--- a/scripts/maintenance/compat2core.py
+++ b/scripts/maintenance/compat2core.py
@@ -18,11 +18,11 @@
 
 to convert a script and show warnings about deprecated methods:
 
-python  pwb.py maintenance/compat2core 
+python  pwb.py compat2core 
 
 to show warnings about deprecated methods:
 
-python pwb.py maintenance/compat2core  -warnonly
+python pwb.py compat2core  -warnonly
 """
 #
 # (C) xqt, 2014-2015

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dde07e75c9e93d2a1bf2d28e1befe0d06d15f0d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Mpaa 
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...Patroller[master]: Replace removed ChangesList::newFromUser function

2016-11-13 Thread Cblair91 (Code Review)

Cblair91 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321228

Change subject: Replace removed ChangesList::newFromUser function
..

Replace removed ChangesList::newFromUser function

newFromUser() was removed during commit 94083 for MediaWiki 1.23.

Change-Id: I37c9ae531b466fa7347e8ee98731a0b2981997c1
---
M Patroller.php
M SpecialPatroller.php
M extension.json
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/Patroller.php b/Patroller.php
index d3ca513..962ce96 100644
--- a/Patroller.php
+++ b/Patroller.php
@@ -27,7 +27,7 @@
'name'  => 'Patroller',
'descriptionmsg'=> 'patrol-desc',
'author'=> 'Rob Church, Kris Blair (Cblair91)',
-   'version'   => '2.0',
+   'version'   => '2.0.1',
'url'   => 
'https://www.mediawiki.org/wiki/Extension:Patroller',
'licence-name'  => 'GPL-2.0'
 ];
diff --git a/SpecialPatroller.php b/SpecialPatroller.php
index 41faa70..afcea01 100644
--- a/SpecialPatroller.php
+++ b/SpecialPatroller.php
@@ -124,7 +124,7 @@
global $wgUser, $wgOut;
$edit->counter = 1;
$edit->mAttribs['rc_patrolled'] = 1;
-   $list = ChangesList::newFromUser( $wgUser );
+   $list = ChangesList::newFromContext( RequestContext::GetMain() 
);
$wgOut->addHTML(
$list->beginRecentChangesList()
. $list->recentChangesLine( $edit )
diff --git a/extension.json b/extension.json
index b253080..4faf63c 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Patroller",
-   "version": "2.0",
+   "version": "2.0.1",
"author": [
"Rob Church",
"Kris Blair (Cblair91)"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37c9ae531b466fa7347e8ee98731a0b2981997c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Cblair91 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Karelian (krl) to Names.php and RELEASE-NOTES-1.28

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Karelian (krl) to Names.php and RELEASE-NOTES-1.28
..


Karelian (krl) to Names.php and RELEASE-NOTES-1.28

* Added Karelian (krl) to Names.php.
* Added mention to RELEASE-NOTES-1.28
* Created MessagesKrl.php and $fallback = 'fi';

Bug: T137415
Change-Id: Iee2d03d042c8b514ee2575450a37158b26c732a3
---
M RELEASE-NOTES-1.28
M languages/data/Names.php
A languages/messages/MessagesKrl.php
3 files changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 557162e..9059e79 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -199,6 +199,8 @@
   Saiddzone Saimawnkham, Saosukham, and Sengwan.
 * Czech (cs) and Slovak (sk) set as reciprocal fallbacks.
 * (T146744) Livvi-Karelian (olo) namespace messages created thanks to 
translator Ilja.mos.
+* Karelian (krl), thanks to translators Flrn, Ilja.mos, Likopiän tyttö, 
Mashoi7, Matma Rex,
+  Ontoi, Theunitedstatesofme, and Varvana.
 
 === Other changes in 1.28 ===
 * (T128697) Improved handling of large diffs.
diff --git a/languages/data/Names.php b/languages/data/Names.php
index 1ed9a44..c00463b 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -241,6 +241,7 @@
'krc' => 'къарачай-малкъар', # Karachay-Balkar
'kri' => 'Krio', # Krio
'krj' => 'Kinaray-a', # Kinaray-a
+   'krl' => 'karjal', # Karelian
'ks' => 'कॉशुर / کٲشُر', # Kashmiri (multiple scripts - 
defaults to Perso-Arabic)
'ks-arab' => 'کٲشُر', # Kashmiri (Perso-Arabic script)
'ks-deva' => 'कॉशुर', # Kashmiri (Devanagari script)
diff --git a/languages/messages/MessagesKrl.php 
b/languages/messages/MessagesKrl.php
new file mode 100644
index 000..b991899
--- /dev/null
+++ b/languages/messages/MessagesKrl.php
@@ -0,0 +1,11 @@
+https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'fi'; // T137415

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee2d03d042c8b514ee2575450a37158b26c732a3
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: Log mwclient failure details

2016-11-13 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: openstack: Log mwclient failure details
..


openstack: Log mwclient failure details

Log the full exception on mwclient authentication failure. This should
help track down the root cause of "MW has a bug that kills a fair number
of these logins".

Change-Id: Ic7c5303e68d94cb06f1f1ea651afebc3a65aa6ec
---
M modules/openstack/files/liberty/nova/wikistatus/wikistatus.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Alex Monk: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py 
b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py
index 5d48ebe..152b272 100644
--- a/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py
+++ b/modules/openstack/files/liberty/nova/wikistatus/wikistatus.py
@@ -114,8 +114,8 @@
domain=CONF.wiki_domain)
 return site
 except mwclient.APIError:
-LOG.warning("mwclient login failed, will try %s more times"
-% count)
+LOG.exception(
+"mwclient login failed, will try %d more times" % 
count)
 time.sleep(2)
 raise mwclient.MaximumRetriesExceeded()
 else:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7c5303e68d94cb06f1f1ea651afebc3a65aa6ec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add hooks to Special:TrackingCategories

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321224

Change subject: Add hooks to Special:TrackingCategories
..

Add hooks to Special:TrackingCategories

Needed to use in the CategoryTree extension to show the category count
on the special page.
See If3815586c2a280b4e8958c13010c9f7436b8723d

Change-Id: If195fb55dee1350a6de095892ce89e6565287cd9
---
M docs/hooks.txt
M includes/specials/SpecialTrackingCategories.php
2 files changed, 17 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/321224/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 5b707c1..09370ed 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3217,6 +3217,15 @@
   message key to use in the name column,
 $context: IContextSource object
 
+'SpecialTrackingCategories::preprocess': Called after LinkBatch on 
Special:TrackingCategories
+$specialPage: The SpecialTrackingCategories object
+$trackingCategories: Array of data from Special:TrackingCategories with msg 
and cats
+
+'SpecialTrackingCategories::generateCatLink': Called for each cat link on 
Special:TrackingCategories
+$specialPage: The SpecialTrackingCategories object
+$catTitle: The Title object of the linked category
+&$html: The Result html
+
 'SpecialUploadComplete': Called after successfully uploading a file from
 Special:Upload.
 &$form: The SpecialUpload object
diff --git a/includes/specials/SpecialTrackingCategories.php 
b/includes/specials/SpecialTrackingCategories.php
index 3b502f8..4c6a345 100644
--- a/includes/specials/SpecialTrackingCategories.php
+++ b/includes/specials/SpecialTrackingCategories.php
@@ -87,6 +87,8 @@
}
$batch->execute();
 
+   Hooks::run( 'SpecialTrackingCategories::preprocess', [ $this, 
$trackingCategories ] );
+
foreach ( $trackingCategories as $catMsg => $data ) {
$allMsgs = [];
$catDesc = $catMsg . '-desc';
@@ -97,11 +99,15 @@
);
 
foreach ( $data['cats'] as $catTitle ) {
-   $catTitleText = Linker::link(
+   $html = Linker::link(
$catTitle,
htmlspecialchars( $catTitle->getText() )
);
-   $allMsgs[] = $catTitleText;
+
+   Hooks::run( 
'SpecialTrackingCategories::generateCatLink',
+   [ $this, $catTitle, &$html ] );
+
+   $allMsgs[] = $html;
}
 
# Extra message, when no category was found

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If195fb55dee1350a6de095892ce89e6565287cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...Genealogy[master]: A start on person metadata, but it's not working well yet.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: A start on person  metadata, but it's not working well yet.
..


A start on person  metadata, but it's not working well yet.

Change-Id: I2062c1a2e215ad2c0c9d0586c626795d93da3a0c
---
M Genealogy.php
M Person.php
M README.md
3 files changed, 89 insertions(+), 23 deletions(-)

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



diff --git a/Genealogy.php b/Genealogy.php
index 2ba4348..b85f2e6 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -53,28 +53,46 @@
  * @param string $param3
  * @return string The wikitext with which to replace the parser function call.
  */
-function GenealogyRenderParserFunction(Parser $parser, $type = '', $one = '', 
$two = '') {
+function GenealogyRenderParserFunction(Parser $parser) {
+   $params = array();
+   $args = func_get_args();
+   array_shift($args); // Remove $parser
+   $type = array_shift($args); // Get param 1, the function type
+   foreach ( $args as $arg ) { // Everything that's left must be named
+   $pair = explode('=', $arg, 2);
+   if ( count( $pair ) == 2 ) {
+   $name = trim($pair[0]);
+   $value = trim($pair[1]);
+   $params[$name] = $value;
+   } else {
+   $params[] = $arg;
+   }
+   }
+   $out = ''; //"".print_r($params, true)."";
switch ($type) {
+   case 'person':
+   $out .= 'b.'.$params['birth date'];
+   break;
case 'parent':
-   $out = "[[$one]]";
+   $out .= "[[".$params[0]."]]";
break;
case 'siblings':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getSiblings());
+   $out .= GenealogyPeopleList($person->getSiblings());
break;
case 'partner':
-   $out = "[[$one]]";
+   $out .= "[[".$params[0]."]]";
break;
case 'partners':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getPartners());
+   $out .= GenealogyPeopleList($person->getPartners());
break;
case 'children':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getChildren());
+   $out .= GenealogyPeopleList($person->getChildren());
break;
default:
-   $out = ''
+   $out .= ''
.'Genealogy parser function type not 
recognised: "'.$type.'".'
.'';
break;
@@ -91,7 +109,8 @@
 function GenealogyPeopleList($people) {
$out = '';
foreach ($people as $person) {
-   $out .= "* [[".$person->getTitle()->getPrefixedText()."]]\n";
+   $date = ($person->hasDates()) ? " 
(".$person->getBirthDate().")" : "";
+   $out .= "* 
[[".$person->getTitle()->getPrefixedText()."]]$date\n";
}
return $out;
 }
diff --git a/Person.php b/Person.php
index 37b0bf1..42b5647 100644
--- a/Person.php
+++ b/Person.php
@@ -27,6 +27,34 @@
}
 
/**
+* Whether or not this person has a birth or death date.
+* @return boolean
+*/
+   public function hasDates() {
+   return $this->getBirthDate()!==FALSE;
+   }
+
+   /**
+* Get the birth date of this person, or false if it's not defined. If 
strtotime recognises the
+* format, the date will be converted to the standard wiki date format; 
if it doesn't, the
+* value defined in the page will be returned.
+* @return string
+*/
+   public function getBirthDate() {
+   $pattern = '/{{\#'.$this->magicRegex.':\s*person.*birth 
date=([^|}]*)/';
+   preg_match_all($pattern, $this->getText(), $matches);
+   if (!isset($matches[1][0])) {
+   return FALSE;
+   }
+   $time = strtotime($matches[1][0]);
+   if ($time!==FALSE) {
+   return date('j F Y', $time);
+   } else {
+   return $matches[1][0];
+   }
+   }
+
+   /**
 * Get all parents.
 *
 * @return array|GenealogyPerson An array of parents, possibly empty.
@@ -36,10 +64,8 @@
return $this->parents;
}
$this->parents = array();
-

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Reduce line lengths for codesniffer conformance.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: Reduce line lengths for codesniffer conformance.
..


Reduce line lengths for codesniffer conformance.

Change-Id: Ica44043b8bdd35567aa71970ab37d8eec5812e7e
---
M Genealogy.i18n.php
M Genealogy.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 9760c99..ce9bf78 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -14,5 +14,6 @@
  */
 $messages['en'] = array(
'genealogy' => "Genealogy",
-   'genealogy-desc' => "Adds a parser function for reducing redundancy 
when linking between genealogical records",
+   'genealogy-desc' => "Adds a parser function for reducing redundancy '"
+   ."when linking between genealogical 
records",
 );
diff --git a/Genealogy.php b/Genealogy.php
index 987fe54..2ba4348 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -74,7 +74,9 @@
$out = GenealogyPeopleList($person->getChildren());
break;
default:
-   $out = 'Genealogy parser function 
type not recognised: "' . $type . '".';
+   $out = ''
+   .'Genealogy parser function type not 
recognised: "'.$type.'".'
+   .'';
break;
}
return $out;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica44043b8bdd35567aa71970ab37d8eec5812e7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 
Gerrit-Reviewer: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: First draft, linking people's pages only. Dates etc. still t...

2016-11-13 Thread Samwilson (Code Review)

Samwilson has submitted this change and it was merged.

Change subject: First draft, linking people's pages only. Dates etc. still to 
come.
..


First draft, linking people's pages only. Dates etc. still to come.

Change-Id: I23c455c23fba6efee145fa5ad19625153f1e2eb7
---
A Genealogy.i18n.magic.php
A Genealogy.i18n.php
A Genealogy.php
A LICENSE.txt
A Person.php
A README.md
6 files changed, 586 insertions(+), 0 deletions(-)

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



diff --git a/Genealogy.i18n.magic.php b/Genealogy.i18n.magic.php
new file mode 100644
index 000..d05cc70
--- /dev/null
+++ b/Genealogy.i18n.magic.php
@@ -0,0 +1,17 @@
+
+ */
+$magicWords['en'] = array(
+   'genealogy' => array(0, 'genealogy'),
+);
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
new file mode 100644
index 000..acf91fb
--- /dev/null
+++ b/Genealogy.i18n.php
@@ -0,0 +1,18 @@
+
+ */
+$messages['en'] = array(
+   'genealogy' => "Genealogy",
+   'genealogy-desc' => "The Genealogy extension.",
+);
diff --git a/Genealogy.php b/Genealogy.php
new file mode 100644
index 000..987fe54
--- /dev/null
+++ b/Genealogy.php
@@ -0,0 +1,95 @@
+ __FILE__,
+   'name' => 'Genealogy',
+   'author' => "Sam Wilson <[mailto:s...@samwilson.id.au 
s...@samwilson.id.au]>",
+   'url' => "http://www.mediawiki.org/wiki/Extension:Genealogy;,
+   'descriptionmsg' => 'genealogy-desc',
+   'license-name' => 'GPL-3.0+',
+   'version' => '0.1.0',
+);
+
+/**
+ * Messages
+ */
+$wgExtensionMessagesFiles['Genealogy'] = __DIR__ . '/Genealogy.i18n.php';
+$wgExtensionMessagesFiles['GenealogyMagic'] = __DIR__ . 
'/Genealogy.i18n.magic.php';
+
+/**
+ * Class loading and the Special page
+ */
+$wgAutoloadClasses['Genealogy'] = __FILE__;
+$wgAutoloadClasses['GenealogyPerson'] = __DIR__ . '/Person.php';
+$wgAutoloadClasses['GenealogySpecial'] = __DIR__ . '/Special.php';
+$wgSpecialPages['Genealogy'] = 'GenealogySpecial';
+
+/**
+ * Parser function
+ */
+$wgHooks['ParserFirstCallInit'][] = 'GenealogySetupParserFunction';
+
+function GenealogySetupParserFunction(Parser &$parser) {
+   $parser->setFunctionHook('genealogy', 'GenealogyRenderParserFunction');
+   return true;
+}
+
+/**
+ * Render the output of the parser function.
+ * The input parameters are wikitext with templates expanded.
+ * The output should be wikitext too.
+ *
+ * @param Parser $parser
+ * @param string $type
+ * @param string $param2
+ * @param string $param3
+ * @return string The wikitext with which to replace the parser function call.
+ */
+function GenealogyRenderParserFunction(Parser $parser, $type = '', $one = '', 
$two = '') {
+   switch ($type) {
+   case 'parent':
+   $out = "[[$one]]";
+   break;
+   case 'siblings':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getSiblings());
+   break;
+   case 'partner':
+   $out = "[[$one]]";
+   break;
+   case 'partners':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getPartners());
+   break;
+   case 'children':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getChildren());
+   break;
+   default:
+   $out = 'Genealogy parser function 
type not recognised: "' . $type . '".';
+   break;
+   }
+   return $out;
+}
+
+/**
+ * Get a wikitext list of people.
+ * @todo Replace with a proper templating system.
+ * @param array|GenealogyPerson $people
+ * @return string
+ */
+function GenealogyPeopleList($people) {
+   $out = '';
+   foreach ($people as $person) {
+   $out .= "* [[".$person->getTitle()->getPrefixedText()."]]\n";
+   }
+   return $out;
+}
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000..dfbc0cb
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,283 @@
+The Genealogy extension is copyright  2014 Sam Wilson and licenced under
+the GPL version 3 or later, as given below.
+
+== GNU GENERAL PUBLIC LICENSE ==
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+=== Preamble ===
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: New beta release.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321209

Change subject: New beta release.
..

New beta release.

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


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

diff --git a/Genealogy.php b/Genealogy.php
index ea3ce10..9ca5711 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -24,7 +24,7 @@
'url' => "http://www.mediawiki.org/wiki/Extension:Genealogy;,
'descriptionmsg' => 'genealogy-desc',
'license-name' => 'GPL-3.0+',
-   'version' => '0.1.0',
+   'version' => '0.2.0',
 );
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592697ec4779b750733c29dd150aee6f514063a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Templates for list items

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321223

Change subject: Templates for list items
..

Templates for list items

Change-Id: I7197fc93abad50dc2fc7309bc32a96be52cc47e2
---
M Genealogy.i18n.php
M README.md
M src/Hooks.php
M src/Person.php
M tests/phpunit/PersonTest.php
5 files changed, 105 insertions(+), 34 deletions(-)


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

diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 9df2339..9d63d97 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -25,4 +25,5 @@
'genealogy-parser-function-not-found' => 'Genealogy parser function 
type not recognised: $1',
'genealogy-existing-partners' => 'This person already has the following 
'
.'{{PLURAL:$1|partner|partners}}: ',
+   'genealogy-person-list-item' => 'Person/list-item'
 ];
diff --git a/README.md b/README.md
index 131e546..c86cfd7 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 All details:
 
[mediawiki.org/wiki/Extension:Genealogy](https://mediawiki.org/wiki/Extension:Genealogy)
 
+
 ## Usage summary
 
 This extension creates one parser function: `{{#genealogy: … }}`.
@@ -25,6 +26,7 @@
`{{#genealogy:tree|ancestors=List|descendants=List}}`
where each `List` is a newline-separated list of page titles.
 
+
 ## Templates
 
 **Example:**
@@ -35,20 +37,40 @@
 When this extension creates a link to a page that doesn't yet exist,
 the text of `[[Template:Person/preload]]` is preloaded.
 The location of this preload text can be customised
-by modifying the `[[MediaWiki:genealogy-person-preload]]` system message.
+by modifying the `genealogy-person-preload` system message.
+
+**Person list-item:**
+Three types of lists of people can be generated: `siblings`, `partners`, and 
`children`.
+The default behaviour is a simple bulleted list,
+but this can be overridden by a template, `Template:Person/list-item`
+(the template name is specified by the `genealogy-person-list-item` system 
message).
+For example, to get a comma-separated one-line list of people, the following 
template code could be used:
+
+```
+{{{link}}}{{#ifeq:{{{index}}}|{{{count}}}|.|,}}
+```
+
+There are four parameters that are available for use in the list-item template:
+* `link` — A wikitext link.
+* `title` — The page title.
+* `index` — The index of this list-item in the full list, starting from 1. 
+* `count` — The total number of items in the full list.
 
 ## Installation
 
-1. Clone into your extensions directory:
+1. Clone the *Genealogy* and *GraphViz* extensions into your extensions 
directory:
```
$ cd extensions
$ git clone https://github.com/samwilson/Genealogy.git
+   $ git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GraphViz.git
```
-2. Enable it in your `LocalSettings.php` file:
+2. Enable them in your `LocalSettings.php` file:
```
wfLoadExtension( 'Genealogy' );
+   wfLoadExtension( 'GraphViz' );
```
 
+
 ## Development
 
 The *Genealogy* extension is developed by Sam Wilson and released under version
diff --git a/src/Hooks.php b/src/Hooks.php
index 9c2e888..f7d7e88 100644
--- a/src/Hooks.php
+++ b/src/Hooks.php
@@ -84,7 +84,7 @@
$params[] = $arg;
}
}
-   $out = ''; // "".print_r($params, true)."";
+   $out = '';
$isHtml = false;
switch ( $type ) {
case 'person':
@@ -99,30 +99,31 @@
break;
case 'parent':
$parentTitle = Title::newFromText( $params[0] );
-   if ( $parentTitle && $parentTitle->exists() ) {
-   $parent = new Person( $parentTitle );
-   $out .= $parent->getWikiLink();
-   } else {
-   $query = [ 'preload' => wfMessage( 
'genealogy-person-preload' ) ];
-   $out .= Linker::link( $parentTitle, 
null, [], $query );
-   $isHtml = true;
-   }
+   $parent = new Person( $parentTitle );
+   $out .= $parent->getWikiLink();
+// if ( $parentTitle && $parentTitle->exists() ) {
+// $out .= $parent->getWikiLink();
+// } else {
+// $query = [ 'preload' => wfMessage( 
'genealogy-person-preload' ) ];
+// $out .= Linker::link( $parentTitle, 
null, [], $query );
+// $isHtml = true;
+// }

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Switch to using page properties for storage.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321204

Change subject: Switch to using page properties for storage.
..

Switch to using page properties for storage.

Change-Id: Ie781804312cd92332220b66539ba5d08e818f0d8
---
M Genealogy.php
M Person.php
M README.md
3 files changed, 156 insertions(+), 77 deletions(-)


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

diff --git a/Genealogy.php b/Genealogy.php
index b85f2e6..5dfaae5 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -72,16 +72,19 @@
switch ($type) {
case 'person':
$out .= 'b.'.$params['birth date'];
+   GenealogySaveProp($parser, 'birth date', $params['birth 
date'], FALSE);
break;
case 'parent':
$out .= "[[".$params[0]."]]";
+   GenealogySaveProp($parser, 'parent', $params[0]);
break;
case 'siblings':
$person = new GenealogyPerson($parser->getTitle());
$out .= GenealogyPeopleList($person->getSiblings());
break;
case 'partner':
-   $out .= "[[".$params[0]."]]";
+   //$out .= "[[".$params[0]."]]";
+   GenealogySaveProp($parser, 'partner', $params[0]);
break;
case 'partners':
$person = new GenealogyPerson($parser->getTitle());
@@ -100,6 +103,19 @@
return $out;
 }
 
+function GenealogySaveProp($parser, $prop, $val, $multi = TRUE) {
+   if ($multi) {
+   $propNum = 1;
+   while ($par = $parser->getOutput()->getProperty("genealogy 
$prop $propNum")
+   AND $par != $val) {
+   $propNum++;
+   }
+   $parser->getOutput()->setProperty("genealogy $prop $propNum", 
$val);
+   } else {
+   $parser->getOutput()->setProperty("genealogy $prop", $val);
+   }
+}
+
 /**
  * Get a wikitext list of people.
  * @todo Replace with a proper templating system.
diff --git a/Person.php b/Person.php
index 42b5647..c8bfb81 100644
--- a/Person.php
+++ b/Person.php
@@ -2,6 +2,7 @@
 
 class GenealogyPerson {
 
+   /** @var Title */
private $title;
 
private $parents;
@@ -31,7 +32,7 @@
 * @return boolean
 */
public function hasDates() {
-   return $this->getBirthDate()!==FALSE;
+   return $this->getBirthDate() !== FALSE;
}
 
/**
@@ -41,16 +42,12 @@
 * @return string
 */
public function getBirthDate() {
-   $pattern = '/{{\#'.$this->magicRegex.':\s*person.*birth 
date=([^|}]*)/';
-   preg_match_all($pattern, $this->getText(), $matches);
-   if (!isset($matches[1][0])) {
-   return FALSE;
-   }
-   $time = strtotime($matches[1][0]);
-   if ($time!==FALSE) {
+   $birthDate = $this->getPropSingle('birth date');
+   $time = strtotime($birthDate);
+   if ($time !== FALSE) {
return date('j F Y', $time);
} else {
-   return $matches[1][0];
+   return $birthDate;
}
}
 
@@ -63,15 +60,7 @@
if (is_array($this->parents)) {
return $this->parents;
}
-   $this->parents = array();
-   $pattern = 
'/{{\#'.$this->magicRegex.':\s*parent\s*\|\s*([^|}]*)/';
-   preg_match_all($pattern, $this->getText(), $matches);
-   if (isset($matches[1])) {
-   foreach ($matches[1] as $match) {
-   $parentTitle = Title::newFromText($match);
-   
$this->parents[$parentTitle->getPrefixedDBkey()] = new 
GenealogyPerson($parentTitle);
-   }
-   }
+   $this->parents = $this->getPropMulti('parent');
return $this->parents;
}
 
@@ -102,7 +91,11 @@
if (is_array($this->partners)) {
return $this->partners;
}
-   $this->partners = $this->whatLinksHere('partner');
+   $this->partners = array_merge(
+   $this->getPropInbound('partner'),
+   $this->getPropMulti('partner')
+   );
+   //unset($this->partners[$this->title->getPrefixedDBkey()]);
return $this->partners;
}
 
@@ -115,75 +108,145 @@
if (is_array($this->children)) {
return $this->children;
}
-

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Correct autoloading

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321222

Change subject: Correct autoloading
..

Correct autoloading

Change-Id: If388299246ffcd5d63bddb34eede8c17d689e708
---
M extension.json
M src/Hooks.php
2 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/extension.json b/extension.json
index bbfc903..2791e39 100644
--- a/extension.json
+++ b/extension.json
@@ -13,13 +13,13 @@
"GenealogyMagic": "Genealogy.i18n.magic.php"
},
"AutoloadClasses": {
-   "\\Samwilson\\Genealogy\\Person": "src/Person.php",
-   "\\Samwilson\\Genealogy\\Traverser": "src/Traverser.php",
-   "\\Samwilson\\Genealogy\\Tree": "src/Tree.php",
-   "\\Samwilson\\Genealogy\\Hooks": "src/Hooks.php"
+   "Samwilson\\Genealogy\\Person": "src/Person.php",
+   "Samwilson\\Genealogy\\Traverser": "src/Traverser.php",
+   "Samwilson\\Genealogy\\Tree": "src/Tree.php",
+   "Samwilson\\Genealogy\\Hooks": "src/Hooks.php"
},
"Hooks": {
-   "ParserFirstCallInit": 
"\\Samwilson\\Genealogy\\Hooks::onParserFirstCallInit",
+   "ParserFirstCallInit": 
"Samwilson\\Genealogy\\Hooks::onParserFirstCallInit",
"UnitTestsList": "Samwilson\\Genealogy\\Hooks::onUnitTestsList",
"EditPageBeforeEditToolbar": 
"Samwilson\\Genealogy\\Hooks::onEditPageBeforeEditToolbar"
},
diff --git a/src/Hooks.php b/src/Hooks.php
index c54fef6..9c2e888 100644
--- a/src/Hooks.php
+++ b/src/Hooks.php
@@ -29,7 +29,7 @@
 * @param String[] $files
 * @return boolean
 */
-   static function onUnitTestsList( &$files ) {
+   public static function onUnitTestsList( &$files ) {
$files = array_merge( $files, glob( __DIR__ . 
'/tests/phpunit/*Test.php' ) );
return true;
 
@@ -69,7 +69,7 @@
 * @param string $param3
 * @return string The wikitext with which to replace the parser 
function call.
 */
-   static function renderParserFunction( Parser $parser ) {
+   public static function renderParserFunction( Parser $parser ) {
$params = [];
$args = func_get_args();
array_shift( $args ); // Remove $parser

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If388299246ffcd5d63bddb34eede8c17d689e708
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: New extension registration system

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321210

Change subject: New extension registration system
..

New extension registration system

Change-Id: I65cc461886956d3549dfdb09200509baa05b0285
---
A .gitignore
D Genealogy.php
M README.md
M composer.json
A extension.json
R src/Person.php
A src/Special.php
R src/Traverser.php
R src/Tree.php
R src/Util.php
10 files changed, 99 insertions(+), 87 deletions(-)


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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..fcac4a7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/vendor
+
diff --git a/Genealogy.php b/Genealogy.php
deleted file mode 100644
index 9ca5711..000
--- a/Genealogy.php
+++ /dev/null
@@ -1,49 +0,0 @@
- __FILE__,
-   'name' => 'Genealogy',
-   'author' => "Sam Wilson <[mailto:s...@samwilson.id.au 
s...@samwilson.id.au]>",
-   'url' => "http://www.mediawiki.org/wiki/Extension:Genealogy;,
-   'descriptionmsg' => 'genealogy-desc',
-   'license-name' => 'GPL-3.0+',
-   'version' => '0.2.0',
-);
-
-/**
- * Messages
- */
-$wgExtensionMessagesFiles['Genealogy'] = __DIR__ . '/Genealogy.i18n.php';
-$wgExtensionMessagesFiles['GenealogyMagic'] = __DIR__ . 
'/Genealogy.i18n.magic.php';
-
-/**
- * Class loading
- */
-$wgAutoloadClasses['GenealogyPerson']= __DIR__ . '/Person.php';
-$wgAutoloadClasses['GenealogySpecial']   = __DIR__ . '/Special.php';
-$wgAutoloadClasses['GenealogyCore']  = __DIR__ . '/Core.php';
-$wgAutoloadClasses['GenealogyTree']  = __DIR__ . '/Tree.php';
-$wgAutoloadClasses['GenealogyTraverser'] = __DIR__ . '/Traverser.php';
-
-/**
- * Hooks
- */
-$wgHooks['ParserFirstCallInit'][] = 'GenealogyCore::onParserFirstCallInit';
-$wgHooks['UnitTestsList'][] = 'GenealogyCore::onUnitTestsList';
diff --git a/README.md b/README.md
index e3d98e1..0f982f2 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 ## Usage
 
 There is only one parser function, `{{#genealogy:}}`.
-Its first two parameters are unnamed (i.e. don't have equals signs), but all
-others must be (dates, etc.).
+Its first two parameters are unnamed (i.e. don't have equals signs),
+but all others must be (dates, etc.).
 
 The following functions are supported, three for defining data and four for
 reporting data:
diff --git a/composer.json b/composer.json
index 8eab5b5..16b7334 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,9 @@
"irc": "irc://irc.freenode.net/mediawiki",
"source": "https://github.com/samwilson/Genealogy;
},
-   "require": {
-   },
"autoload": {
-   "files" : [
-   "Genealogy.php"
-   ]
+   "psr-4": {
+   "Samwilson\\Genealogy\\": "src/"
+   }
}
 }
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..4ee70c5
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+   "name": "Genealogy",
+   "namemsg": "desc-genealogy",
+   "author": [
+   "Sam Wilson"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:Genealogy;,
+   "descriptionmsg": "genealogy-extension-desc",
+   "license-name": "GPL-3.0+",
+   "type": "extension",
+   "ExtensionMessagesFiles": {
+   "Genealogy": "Genealogy.i18n.php",
+   "GenealogyMagic": "Genealogy.i18n.magic.php"
+   },
+   "AutoloadClasses": {
+   "\\Samwilson\\Genealogy\\Genealogy": "Genealogy.php"
+   },
+   "Hooks": {
+   "ParserFirstCallInit": 
"\\Samwilson\\Genealogy\\Util::onParserFirstCallInit",
+   "UnitTestsList": "Samwilson\\Genealogy\\Util::onUnitTestsList"
+   },
+   "manifest_version": 2
+}
diff --git a/Person.php b/src/Person.php
similarity index 87%
rename from Person.php
rename to src/Person.php
index 3f21c80..34e338a 100644
--- a/Person.php
+++ b/src/Person.php
@@ -1,6 +1,11 @@
 parents)) {
@@ -115,7 +120,7 @@
/**
 * Get all siblings.
 *
-* @return array|GenealogyPerson An array of siblings, possibly empty.
+* @return Person[] An array of siblings, possibly empty.
 */
public function getSiblings() {
if (is_array($this->siblings)) {
@@ -133,7 +138,7 @@
/**
 * Get all partners.
 *
-* @return array|GenealogyPerson An array of partners, possibly empty.
+* @return Person[] An array of partners, possibly empty.
 */
public function getPartners() {
if (is_array($this->partners)) {
@@ -150,7 +155,7 @@
/**
 * Get all children.
 *
-* @return array|GenealogyPerson An array of children, possibly empty.
+* @return Person[] An array of children, possibly empty.
 */

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Invalid page names etc.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321213

Change subject: Invalid page names etc.
..

Invalid page names etc.

Change-Id: Ia46ebd7105fccf8bd729b1a75efe766a3f46270d
---
M README.md
M src/Person.php
M src/Util.php
3 files changed, 13 insertions(+), 6 deletions(-)


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

diff --git a/README.md b/README.md
index 0f982f2..0dda15b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 
 1. Define this person's dates.
   `{{#genealogy:person |birth date=Y-m-d |death date=Y-m-d }}`
-2. Define a parent:
+2. Define and output a link to a parent:
`{{#genealogy:parent | Page Name Here }}`
 3. Define a partner (no output produced; use `partners` to list):
`{{#genealogy:partner | Page Name Here |start date=Y-m-d |end date=Y-m-d }}`
diff --git a/src/Person.php b/src/Person.php
index 292d0fe..a3f76b9 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -222,6 +222,10 @@
);
foreach ( $results as $result ) {
$title = Title::newFromText( $result->pp_value );
+   if ( is_null( $title ) ) {
+   // Do nothing, if this isn't a valid title.
+   continue;
+   }
$out[$title->getPrefixedDBkey()] = new Person( $title );
}
return $out;
diff --git a/src/Util.php b/src/Util.php
index 688dcbf..6a71126 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -32,10 +32,10 @@
 * This method is called by the editFormInitialText hook and adds a 
list of the current page's
 * Genealogy partners that *aren't* a result of a 
{{#genealogy:partner}} call in the current
 * page.
-* @param EditPage $editPage
+* @param string $formInitialText The existing initial text of the form
 * @return void
 */
-   public static function onEditFormInitialText( EditPage &$editPage ) {
+   public static function onEditFormInitialText( &$formInitialText ) {
global $wgTitle;
$person = new Person( $wgTitle );
$peopleList = [];
@@ -44,8 +44,11 @@
.$partner->getTitle()->getText()
."";
}
-   $editPage = 'This person is listed as the partner of the 
following people: '
-   .join( ', ', $peopleList ).''.$editPage;
+   if ( count( $peopleList ) > 0 ) {
+   $formInitialText =
+   'This person is listed as the partner of the 
following people: ' .
+   join( ', ', $peopleList ) . '' . 
$formInitialText;
+   }
}
 
/**
@@ -150,7 +153,7 @@
// Figure out what number we're up to for this property.
$propNum = 1;
$propVal = $output->getProperty( "genealogy $prop 
$propNum" );
-   while ( $propVal !== $val ) {
+   while ( $propVal !== false && $propVal !== $val ) {
$propNum++;
$propVal = $output->getProperty( "genealogy 
$prop $propNum" );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia46ebd7105fccf8bd729b1a75efe766a3f46270d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Better tree drawing

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321215

Change subject: Better tree drawing
..

Better tree drawing

Change-Id: I9c5fad962b52e0dcb64038935ee84b15c7a1f6fb
---
M Genealogy.i18n.php
M README.md
A person_template.wikitext
M src/Person.php
M src/Traverser.php
M src/Tree.php
M src/Util.php
M tests/phpunit/PersonTest.php
8 files changed, 224 insertions(+), 43 deletions(-)


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

diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index db0617a..9a74409 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -13,12 +13,14 @@
  * @author Sam Wilson 
  */
 $messages['en'] = [
-   'genealogy'  => "Genealogy",
-   'genealogy-desc' => "Adds a parser function for easier linking between 
genealogical records",
+   'genealogy' => 'Genealogy',
+   'genealogy-desc' => 'Adds a parser function for easier linking between 
genealogical records',
'genealogy-born' => 'b.',
'genealogy-died' => 'd.',
-   'genealogy-ancestor'   => 'Ancestor',
-   'genealogy-descendant' => 'Descendant',
-   'genealogy-ancestors'  => 'Ancestors',
-   'genealogy-descendants'=> 'Descendants',
+   'genealogy-ancestor' => 'Ancestor',
+   'genealogy-ancestors' => 'Ancestors',
+   'genealogy-descendant' => 'Descendant',
+   'genealogy-descendants' => 'Descendants',
+   'genealogy-person-preload' => 'Template:Person/preload',
+   'genealogy-parser-function-not-found' => 'Genealogy parser function 
type not recognised: $1',
 ];
diff --git a/README.md b/README.md
index 0dda15b..49b4935 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
-# MediaWiki Genealogy extension
+MediaWiki Genealogy extension
+=
 
-## Usage
+All details:
+[mediawiki.org/wiki/Extension:Genealogy](https://mediawiki.org/wiki/Extension:Genealogy)
 
-There is only one parser function, `{{#genealogy:}}`.
-Its first two parameters are unnamed (i.e. don't have equals signs),
-but all others must be (dates, etc.).
+## Usage summary
+
+This extension creates one parser function: `{{#genealogy: … }}`.
+Its first two parameters are unnamed (i.e. don't have equals signs)
+but all others are (the dates, etc.).
 
 The following functions are supported, three for defining data and four for
 reporting data:
@@ -25,10 +29,24 @@
`{{#genealogy:tree|ancestors=List|descendants=List}}`
where each `List` is a newline-separated list of page titles.
 
+## Templates
+
+**Example:**
+For an example template that makes use of these parser functions,
+see [`person_template.wikitext`](https://github.com/samwilson/Genealogy)
+
+**Preload:**
+When this extension creates a link to a page that doesn't yet exist,
+the text of `[[Template:Person/preload]]` is preloaded.
+The location of this preload text can be customised
+by modifying the `[[MediaWiki:genealogy-person-preload]]` system message.
+
 ## Development
 
 The *Genealogy* extension is developed by Sam Wilson and released under version
 3 of the GPL (see `LICENSE.txt` for details).
 
+You can see this extension in use on [ArchivesWiki](https://archives.org.au).
+
 Please report all bugs via the GitHub issue tracker at
 https://github.com/samwilson/Genealogy/issues
diff --git a/person_template.wikitext b/person_template.wikitext
new file mode 100644
index 000..0717ecb
--- /dev/null
+++ b/person_template.wikitext
@@ -0,0 +1,43 @@
+{|class=wikitable
+|+ {{PAGENAME}}
+|-
+! Birth:
+| {{{birth_date|}}} {{{birth_place|}}}
+|-
+! Death:
+| {{{death_date|}}} {{{death_place|}}}
+|-
+! Parents:
+|
+{{#if: {{{parent1|}}} | * {{#genealogy:parent | {{{parent1}}} }} }}
+{{#if: {{{parent2|}}} | * {{#genealogy:parent | {{{parent2}}} }} }}
+{{#if: {{{parent3|}}} | * {{#genealogy:parent | {{{parent3}}} }} }}
+|-
+! Siblings:
+| {{#genealogy:siblings}}
+|-
+! Partners:
+| {{#genealogy:partners}}
+{{#if: {{{partner1|}}} | {{#genealogy:partner | {{{partner1}}} }} }}
+{{#if: {{{partner2|}}} | {{#genealogy:partner | {{{partner2}}} }} }}
+{{#if: {{{partner3|}}} | {{#genealogy:partner | {{{partner3}}} }} }}
+|-
+! Children:
+| {{#genealogy:children}}
+|}[[Category:People]]
+This template is used to define and display a summary table on a biography 
article.
+
+It adds articles to the [[:Category:People|People]] category.
+
+== Usage ==
+
+
+{{person
+ | parent1 = Person 1 Name
+ | parent2 = Person 2 Name
+ | parent3 = Person 3 Name
+ | partner1 = Person 4 Name
+ | partner2 = Person 5 Name
+ | partner3 = Person 6 Name
+}}
+
diff --git a/src/Person.php b/src/Person.php
index 905fe3f..b1b5242 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -2,7 +2,9 @@
 
 namespace Samwilson\Genealogy;
 
+use Linker;
 use MagicWord;
+use MediaWiki\Linker\LinkRenderer;
 use Parser;
 use Title;
 use WikiPage;
@@ -145,11 +147,9 @@

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Fix hook loading

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321221

Change subject: Fix hook loading
..

Fix hook loading

Change-Id: If497009e03bcfb9c4e135deefcd7ac6421d18335
---
M extension.json
R src/Hooks.php
2 files changed, 12 insertions(+), 12 deletions(-)


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

diff --git a/extension.json b/extension.json
index 98d640a..bbfc903 100644
--- a/extension.json
+++ b/extension.json
@@ -19,9 +19,9 @@
"\\Samwilson\\Genealogy\\Hooks": "src/Hooks.php"
},
"Hooks": {
-   "ParserFirstCallInit": 
"\\Samwilson\\Genealogy\\Util::onParserFirstCallInit",
-   "UnitTestsList": "Samwilson\\Genealogy\\Util::onUnitTestsList",
-   "EditPageBeforeEditToolbar": 
"Samwilson\\Genealogy\\Util::onEditFormInitialText"
+   "ParserFirstCallInit": 
"\\Samwilson\\Genealogy\\Hooks::onParserFirstCallInit",
+   "UnitTestsList": "Samwilson\\Genealogy\\Hooks::onUnitTestsList",
+   "EditPageBeforeEditToolbar": 
"Samwilson\\Genealogy\\Hooks::onEditPageBeforeEditToolbar"
},
"manifest_version": 1
 }
diff --git a/src/Util.php b/src/Hooks.php
similarity index 91%
rename from src/Util.php
rename to src/Hooks.php
index b87b737..c54fef6 100644
--- a/src/Util.php
+++ b/src/Hooks.php
@@ -12,7 +12,7 @@
 use WikiPage;
 use Xml;
 
-class Util {
+class Hooks {
 
/**
 * Hooked to ParserFirstCallInit.
@@ -36,25 +36,25 @@
}
 
/**
-* This method is called by the editFormInitialText hook and adds a 
list of the current page's
-* Genealogy partners that *aren't* a result of a 
{{#genealogy:partner}} call in the current
-* page.
-* @param string $formInitialText The existing initial text of the form
+* This method is called by the EditPageBeforeEditToolbar hook and adds 
a list of the current
+* page's Genealogy partners that *aren't* a result of a 
{{#genealogy:partner|…}} call in the
+* current page.
+* @param string $toolbarHtml The existing toolbar HTMl.
 * @return void
 */
-   public static function onEditFormInitialText( &$formInitialText ) {
+   public static function onEditPageBeforeEditToolbar( &$toolbarHtml ) {
global $wgTitle;
$person = new Person( $wgTitle );
$peopleList = [];
foreach ( $person->getPartners( true ) as $partner ) {
$peopleList[] = ''
-   .$partner->getTitle()->getText()
-   ."";
+   .$partner->getTitle()->getText()
+   ."";
}
if ( count( $peopleList ) > 0 ) {
$msg = wfMessage( 'genealogy-existing-partners', count( 
$peopleList ) );
$successBox = '' . $msg. join( ', 
', $peopleList ) . '';
-   $formInitialText = $successBox . $formInitialText;
+   $toolbarHtml = $successBox . $toolbarHtml;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If497009e03bcfb9c4e135deefcd7ac6421d18335
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Better message

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321217

Change subject: Better message
..

Better message

Change-Id: I39adea671dfe44e7aa27a4c0bc3634bc1e6fdfb6
---
M Genealogy.i18n.php
M README.md
M extension.json
M src/Util.php
4 files changed, 7 insertions(+), 5 deletions(-)


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

diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 9a74409..9df2339 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -23,4 +23,6 @@
'genealogy-descendants' => 'Descendants',
'genealogy-person-preload' => 'Template:Person/preload',
'genealogy-parser-function-not-found' => 'Genealogy parser function 
type not recognised: $1',
+   'genealogy-existing-partners' => 'This person already has the following 
'
+   .'{{PLURAL:$1|partner|partners}}: ',
 ];
diff --git a/README.md b/README.md
index 49b4935..360eede 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
 
 **Example:**
 For an example template that makes use of these parser functions,
-see [`person_template.wikitext`](https://github.com/samwilson/Genealogy)
+see 
[`person_template.wikitext`](https://github.com/samwilson/Genealogy/blob/master/person_template.wikitext)
 
 **Preload:**
 When this extension creates a link to a page that doesn't yet exist,
diff --git a/extension.json b/extension.json
index 23a8a74..4a85ef5 100644
--- a/extension.json
+++ b/extension.json
@@ -20,5 +20,5 @@
"UnitTestsList": "Samwilson\\Genealogy\\Util::onUnitTestsList",
"EditPageBeforeEditToolbar": 
"Samwilson\\Genealogy\\Util::onEditFormInitialText"
},
-   "manifest_version": 2
+   "manifest_version": 1
 }
diff --git a/src/Util.php b/src/Util.php
index 0f7e49b..c9054cf 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -48,9 +48,9 @@
."";
}
if ( count( $peopleList ) > 0 ) {
-   $formInitialText =
-   'This person is recorded as a partner of the 
following people: ' .
-   join( ', ', $peopleList ) . '' . 
$formInitialText;
+   $msg = wfMessage( 'genealogy-existing-partners', count( 
$peopleList ) );
+   $successBox = '' . $msg. join( ', 
', $peopleList ) . '';
+   $formInitialText = $successBox . $formInitialText;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39adea671dfe44e7aa27a4c0bc3634bc1e6fdfb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Different date handling, and a start on some tests.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321208

Change subject: Different date handling, and a start on some tests.
..

Different date handling, and a start on some tests.

Change-Id: I9bc4c01775b77448539872af7df85d070cd327db
---
M Core.php
M Genealogy.i18n.php
M Genealogy.php
M Person.php
A tests/phpunit/PersonTest.php
5 files changed, 90 insertions(+), 88 deletions(-)


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

diff --git a/Core.php b/Core.php
index 9ecc40a..cdb039b 100644
--- a/Core.php
+++ b/Core.php
@@ -2,8 +2,23 @@
 
 class GenealogyCore {
 
-   static function SetupParserFunction(Parser &$parser) {
+   /**
+* Hooked to ParserFirstCallInit.
+* @param Parser $parser
+* @return boolean
+*/
+   static function onParserFirstCallInit(Parser &$parser) {
$parser->setFunctionHook('genealogy', 
'GenealogyCore::RenderParserFunction');
+   return true;
+   }
+
+   /**
+* Hooked to UnitTestsList.
+* @param array|String $files
+* @return boolean
+*/
+   static function onUnitTestsList(&$files) {
+   $files = array_merge($files, glob(__DIR__ . 
'/tests/phpunit/*Test.php'));
return true;
}
 
@@ -37,11 +52,11 @@
switch ($type) {
case 'person':
if (isset($params['birth date'])) {
-   $out .= 'b.' . $params['birth 
date'];
+   $out .= $params['birth date'];
self::SaveProp($parser, 'birth date', 
$params['birth date'], false);
}
if (isset($params['death date'])) {
-   $out .= 'd.' . $params['death 
date'];
+   $out .= $params['death date'];
self::SaveProp($parser, 'death date', 
$params['death date'], false);
}
break;
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 44c2ba8..0e9f241 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -15,8 +15,10 @@
 $messages['en'] = array(
'genealogy'  => "Genealogy",
'genealogy-desc' => "Adds a parser function for easier linking between 
genealogical records",
-   'ancestor'   => 'Ancestor',
-   'descendant' => 'Descendant',
-   'ancestors'  => 'Ancestors',
-   'descendants'=> 'Descendants',
+   'genealogy-born' => 'b.',
+   'genealogy-died' => 'd.',
+   'genealogy-ancestor'   => 'Ancestor',
+   'genealogy-descendant' => 'Descendant',
+   'genealogy-ancestors'  => 'Ancestors',
+   'genealogy-descendants'=> 'Descendants',
 );
diff --git a/Genealogy.php b/Genealogy.php
index 9c1f17d..ea3ce10 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -43,6 +43,7 @@
 $wgAutoloadClasses['GenealogyTraverser'] = __DIR__ . '/Traverser.php';
 
 /**
- * Parser function
+ * Hooks
  */
-$wgHooks['ParserFirstCallInit'][] = 'GenealogyCore::SetupParserFunction';
+$wgHooks['ParserFirstCallInit'][] = 'GenealogyCore::onParserFirstCallInit';
+$wgHooks['UnitTestsList'][] = 'GenealogyCore::onUnitTestsList';
diff --git a/Person.php b/Person.php
index ac7a695..3f21c80 100644
--- a/Person.php
+++ b/Person.php
@@ -37,15 +37,15 @@
}
 
public function getWikiLink() {
-   $birthYear = $this->getBirthDate('Y');
-   $deathYear = $this->getDeathDate('Y');
+   $birthYear = $this->getDateYear($this->getBirthDate());
+   $deathYear = $this->getDateYear($this->getDeathDate());
$dateString = '';
if (!empty($birthYear) && !empty($deathYear)) {
$dateString = "($birthYear$deathYear)";
} elseif (!empty($birthYear) && empty($deathYear)) {
-   $dateString = "(b.$birthYear)";
+   $dateString = 
"(".wfMessage('genealogy-born')."$birthYear)";
} elseif (empty($birthYear) && !empty($deathYear)) {
-   $dateString = "(d.$deathYear)";
+   $dateString = 
"(".wfMessage('genealogy-died')."$deathYear)";
}
$date = ($this->hasDates()) ? " $dateString" : "";
return "[[" . $this->getTitle()->getPrefixedText() . "]]$date";
@@ -56,41 +56,44 @@
 * @return boolean
 */
public function hasDates() {
-   return $this->getBirthDate() !== false;
+   return $this->getBirthDate() !== false || $this->getDeathDate() 
!== false;
}
 
/**
-* Get the birth date of this person. 
-

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Depth limits

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321219

Change subject: Depth limits
..

Depth limits

Change-Id: If3971637e909923eb9b6be6a50c282e0529f0fab
---
M src/Tree.php
M src/Util.php
2 files changed, 33 insertions(+), 4 deletions(-)


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

diff --git a/src/Tree.php b/src/Tree.php
index 9222ec9..3aaa034 100644
--- a/src/Tree.php
+++ b/src/Tree.php
@@ -21,23 +21,44 @@
/** @var integer */
protected $descendant_depth;
 
+   /**
+* Set the number of levels the tree will go up to from the ancestors' 
starting points.
+* @param integer $ancestor_depth
+*/
public function setAncestorDepth( $ancestor_depth ) {
$this->ancestor_depth = $ancestor_depth;
}
 
+   /**
+* Set the number of levels the tree will go down to from the 
descendants' starting points.
+* @param integer $descendant_depth
+*/
public function setDescendantDepth( $descendant_depth ) {
$this->descendant_depth = $descendant_depth;
}
 
+   /**
+* Add ancestor starting points to this tree, from which to traverse 
upwards.
+* @param string[] $ancestors Array of page titles.
+*/
public function addAncestors( $ancestors ) {
$this->addAncestorsOrDescendants( 'ancestors', $ancestors );
}
 
+   /**
+* Add descendant starting points to this tree, from which to traverse 
downwards.
+* @param string[] $descendants Array of page titles.
+*/
public function addDescendants( $descendants ) {
$this->addAncestorsOrDescendants( 'descendants', $descendants );
}
 
-   private function addAncestorsOrDescendants( $type, $list ) {
+   /**
+* Add ancestor or descendant starting points to this tree.
+* @param string $type
+* @param string[] $list
+*/
+   protected function addAncestorsOrDescendants( $type, $list ) {
foreach ( $list as $a ) {
$title = Title::newFromText( $a );
if ( $title ) {
@@ -47,6 +68,10 @@
}
}
 
+   /**
+* Get the Dot source code for the graph of this tree.
+* @return string
+*/
public function getGraphviz() {
$this->out( 'top', 'start', 'digraph GenealogyTree {' );
$this->out( 'top', 'graph-attrs', 'graph [rankdir=LR]' );
diff --git a/src/Util.php b/src/Util.php
index f5e453b..b87b737 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -129,14 +129,18 @@
if ( isset( $params['ancestors'] ) ) {
$tree->addAncestors( explode( "\n", 
$params['ancestors'] ) );
}
-   // $tree->setAncestorDepth($params['ancestor 
depth']);
+   if ( isset( $params['ancestor depth'] ) ) {
+   $tree->setAncestorDepth( 
$params['ancestor depth'] );
+   }
if ( isset( $params['descendants'] ) ) {
$tree->addDescendants( explode( "\n", 
$params['descendants'] ) );
}
-   // 
$tree->setDescendantDepth($params['descendant depth']);
+   if ( isset( $params['descendant depth'] ) ) {
+   $tree->setDescendantDepth( 
$params['descendant depth'] );
+   }
$graphviz = $tree->getGraphviz();
$out .= $parser->recursiveTagParse( 
"\n$graphviz\n" );
-   $out .= $parser->recursiveTagParse( 
"$graphviz" );
+   // $out .= $parser->recursiveTagParse( 
"$graphviz" );
break;
default:
$msg = wfMessage( 
'genealogy-parser-function-not-found', [ $type ] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3971637e909923eb9b6be6a50c282e0529f0fab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Genealogy
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: First draft, linking people's pages only. Dates etc. still t...

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321200

Change subject: First draft, linking people's pages only. Dates etc. still to 
come.
..

First draft, linking people's pages only. Dates etc. still to come.

Change-Id: I23c455c23fba6efee145fa5ad19625153f1e2eb7
---
A Genealogy.i18n.magic.php
A Genealogy.i18n.php
A Genealogy.php
A LICENSE.txt
A Person.php
A README.md
6 files changed, 586 insertions(+), 0 deletions(-)


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

diff --git a/Genealogy.i18n.magic.php b/Genealogy.i18n.magic.php
new file mode 100644
index 000..d05cc70
--- /dev/null
+++ b/Genealogy.i18n.magic.php
@@ -0,0 +1,17 @@
+
+ */
+$magicWords['en'] = array(
+   'genealogy' => array(0, 'genealogy'),
+);
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
new file mode 100644
index 000..acf91fb
--- /dev/null
+++ b/Genealogy.i18n.php
@@ -0,0 +1,18 @@
+
+ */
+$messages['en'] = array(
+   'genealogy' => "Genealogy",
+   'genealogy-desc' => "The Genealogy extension.",
+);
diff --git a/Genealogy.php b/Genealogy.php
new file mode 100644
index 000..987fe54
--- /dev/null
+++ b/Genealogy.php
@@ -0,0 +1,95 @@
+ __FILE__,
+   'name' => 'Genealogy',
+   'author' => "Sam Wilson <[mailto:s...@samwilson.id.au 
s...@samwilson.id.au]>",
+   'url' => "http://www.mediawiki.org/wiki/Extension:Genealogy;,
+   'descriptionmsg' => 'genealogy-desc',
+   'license-name' => 'GPL-3.0+',
+   'version' => '0.1.0',
+);
+
+/**
+ * Messages
+ */
+$wgExtensionMessagesFiles['Genealogy'] = __DIR__ . '/Genealogy.i18n.php';
+$wgExtensionMessagesFiles['GenealogyMagic'] = __DIR__ . 
'/Genealogy.i18n.magic.php';
+
+/**
+ * Class loading and the Special page
+ */
+$wgAutoloadClasses['Genealogy'] = __FILE__;
+$wgAutoloadClasses['GenealogyPerson'] = __DIR__ . '/Person.php';
+$wgAutoloadClasses['GenealogySpecial'] = __DIR__ . '/Special.php';
+$wgSpecialPages['Genealogy'] = 'GenealogySpecial';
+
+/**
+ * Parser function
+ */
+$wgHooks['ParserFirstCallInit'][] = 'GenealogySetupParserFunction';
+
+function GenealogySetupParserFunction(Parser &$parser) {
+   $parser->setFunctionHook('genealogy', 'GenealogyRenderParserFunction');
+   return true;
+}
+
+/**
+ * Render the output of the parser function.
+ * The input parameters are wikitext with templates expanded.
+ * The output should be wikitext too.
+ *
+ * @param Parser $parser
+ * @param string $type
+ * @param string $param2
+ * @param string $param3
+ * @return string The wikitext with which to replace the parser function call.
+ */
+function GenealogyRenderParserFunction(Parser $parser, $type = '', $one = '', 
$two = '') {
+   switch ($type) {
+   case 'parent':
+   $out = "[[$one]]";
+   break;
+   case 'siblings':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getSiblings());
+   break;
+   case 'partner':
+   $out = "[[$one]]";
+   break;
+   case 'partners':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getPartners());
+   break;
+   case 'children':
+   $person = new GenealogyPerson($parser->getTitle());
+   $out = GenealogyPeopleList($person->getChildren());
+   break;
+   default:
+   $out = 'Genealogy parser function 
type not recognised: "' . $type . '".';
+   break;
+   }
+   return $out;
+}
+
+/**
+ * Get a wikitext list of people.
+ * @todo Replace with a proper templating system.
+ * @param array|GenealogyPerson $people
+ * @return string
+ */
+function GenealogyPeopleList($people) {
+   $out = '';
+   foreach ($people as $person) {
+   $out .= "* [[".$person->getTitle()->getPrefixedText()."]]\n";
+   }
+   return $out;
+}
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000..dfbc0cb
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,283 @@
+The Genealogy extension is copyright  2014 Sam Wilson and licenced under
+the GPL version 3 or later, as given below.
+
+== GNU GENERAL PUBLIC LICENSE ==
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+=== Preamble ===
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: A start on person metadata, but it's not working well yet.

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321203

Change subject: A start on person  metadata, but it's not working well yet.
..

A start on person  metadata, but it's not working well yet.

Change-Id: I2062c1a2e215ad2c0c9d0586c626795d93da3a0c
---
M Genealogy.php
M Person.php
M README.md
3 files changed, 89 insertions(+), 23 deletions(-)


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

diff --git a/Genealogy.php b/Genealogy.php
index 2ba4348..b85f2e6 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -53,28 +53,46 @@
  * @param string $param3
  * @return string The wikitext with which to replace the parser function call.
  */
-function GenealogyRenderParserFunction(Parser $parser, $type = '', $one = '', 
$two = '') {
+function GenealogyRenderParserFunction(Parser $parser) {
+   $params = array();
+   $args = func_get_args();
+   array_shift($args); // Remove $parser
+   $type = array_shift($args); // Get param 1, the function type
+   foreach ( $args as $arg ) { // Everything that's left must be named
+   $pair = explode('=', $arg, 2);
+   if ( count( $pair ) == 2 ) {
+   $name = trim($pair[0]);
+   $value = trim($pair[1]);
+   $params[$name] = $value;
+   } else {
+   $params[] = $arg;
+   }
+   }
+   $out = ''; //"".print_r($params, true)."";
switch ($type) {
+   case 'person':
+   $out .= 'b.'.$params['birth date'];
+   break;
case 'parent':
-   $out = "[[$one]]";
+   $out .= "[[".$params[0]."]]";
break;
case 'siblings':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getSiblings());
+   $out .= GenealogyPeopleList($person->getSiblings());
break;
case 'partner':
-   $out = "[[$one]]";
+   $out .= "[[".$params[0]."]]";
break;
case 'partners':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getPartners());
+   $out .= GenealogyPeopleList($person->getPartners());
break;
case 'children':
$person = new GenealogyPerson($parser->getTitle());
-   $out = GenealogyPeopleList($person->getChildren());
+   $out .= GenealogyPeopleList($person->getChildren());
break;
default:
-   $out = ''
+   $out .= ''
.'Genealogy parser function type not 
recognised: "'.$type.'".'
.'';
break;
@@ -91,7 +109,8 @@
 function GenealogyPeopleList($people) {
$out = '';
foreach ($people as $person) {
-   $out .= "* [[".$person->getTitle()->getPrefixedText()."]]\n";
+   $date = ($person->hasDates()) ? " 
(".$person->getBirthDate().")" : "";
+   $out .= "* 
[[".$person->getTitle()->getPrefixedText()."]]$date\n";
}
return $out;
 }
diff --git a/Person.php b/Person.php
index 37b0bf1..42b5647 100644
--- a/Person.php
+++ b/Person.php
@@ -27,6 +27,34 @@
}
 
/**
+* Whether or not this person has a birth or death date.
+* @return boolean
+*/
+   public function hasDates() {
+   return $this->getBirthDate()!==FALSE;
+   }
+
+   /**
+* Get the birth date of this person, or false if it's not defined. If 
strtotime recognises the
+* format, the date will be converted to the standard wiki date format; 
if it doesn't, the
+* value defined in the page will be returned.
+* @return string
+*/
+   public function getBirthDate() {
+   $pattern = '/{{\#'.$this->magicRegex.':\s*person.*birth 
date=([^|}]*)/';
+   preg_match_all($pattern, $this->getText(), $matches);
+   if (!isset($matches[1][0])) {
+   return FALSE;
+   }
+   $time = strtotime($matches[1][0]);
+   if ($time!==FALSE) {
+   return date('j F Y', $time);
+   } else {
+   return $matches[1][0];
+   }
+   }
+
+   /**
 * Get all parents.
 *
 * @return array|GenealogyPerson An array of parents, possibly empty.
@@ -36,10 +64,8 @@
return $this->parents;

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Beginnings of a tree-drawing system (with GraphViz).

2016-11-13 Thread Samwilson (Code Review)

Samwilson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321206

Change subject: Beginnings of a tree-drawing system (with GraphViz).
..

Beginnings of a tree-drawing system (with GraphViz).

Change-Id: If783bc530f0fd1e152871863be62cd7655282532
---
M Core.php
M Genealogy.i18n.php
M Genealogy.php
M Person.php
M README.md
A Traverser.php
A Tree.php
7 files changed, 197 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Genealogy 
refs/changes/06/321206/1

diff --git a/Core.php b/Core.php
index ba5b80d..9ecc40a 100644
--- a/Core.php
+++ b/Core.php
@@ -47,7 +47,7 @@
break;
case 'parent':
$parentTitle = Title::newFromText($params[0]);
-   if ($parentTitle->exists()) {
+   if ($parentTitle and $parentTitle->exists()) {
$person = new 
GenealogyPerson($parentTitle);
$out .= $person->getWikiLink();
} else {
@@ -71,6 +71,19 @@
$person = new 
GenealogyPerson($parser->getTitle());
$out .= 
self::PeopleList($person->getChildren());
break;
+   case 'tree':
+   $tree = new GenealogyTree();
+   if (isset($params['ancestors'])) {
+   $tree->addAncestors(explode("\n", 
$params['ancestors']));
+   }
+   //$tree->setAncestorDepth($params['ancestor 
depth']);
+   if (isset($params['descendants'])) {
+   $tree->addDescendants(explode("\n", 
$params['descendants']));
+   }
+   //$tree->setDescendantDepth($params['descendant 
depth']);
+   $graphviz = $tree->getGraphviz();
+   $out .= 
$parser->recursiveTagParse("\n$graphviz\n");
+   break;
default:
$out .= ''
. 'Genealogy parser function type not 
recognised: "' . $type . '".'
diff --git a/Genealogy.i18n.php b/Genealogy.i18n.php
index 07784f9..44c2ba8 100644
--- a/Genealogy.i18n.php
+++ b/Genealogy.i18n.php
@@ -13,6 +13,10 @@
  * @author Sam Wilson 
  */
 $messages['en'] = array(
-   'genealogy' => "Genealogy",
+   'genealogy'  => "Genealogy",
'genealogy-desc' => "Adds a parser function for easier linking between 
genealogical records",
+   'ancestor'   => 'Ancestor',
+   'descendant' => 'Descendant',
+   'ancestors'  => 'Ancestors',
+   'descendants'=> 'Descendants',
 );
diff --git a/Genealogy.php b/Genealogy.php
index 49e8308..9c1f17d 100644
--- a/Genealogy.php
+++ b/Genealogy.php
@@ -34,13 +34,13 @@
 $wgExtensionMessagesFiles['GenealogyMagic'] = __DIR__ . 
'/Genealogy.i18n.magic.php';
 
 /**
- * Class loading and the Special page
+ * Class loading
  */
-$wgAutoloadClasses['Genealogy'] = __FILE__;
-$wgAutoloadClasses['GenealogyPerson'] = __DIR__ . '/Person.php';
-$wgAutoloadClasses['GenealogySpecial'] = __DIR__ . '/Special.php';
-$wgAutoloadClasses['GenealogyCore'] = __DIR__ . '/Core.php';
-$wgSpecialPages['Genealogy'] = 'GenealogySpecial';
+$wgAutoloadClasses['GenealogyPerson']= __DIR__ . '/Person.php';
+$wgAutoloadClasses['GenealogySpecial']   = __DIR__ . '/Special.php';
+$wgAutoloadClasses['GenealogyCore']  = __DIR__ . '/Core.php';
+$wgAutoloadClasses['GenealogyTree']  = __DIR__ . '/Tree.php';
+$wgAutoloadClasses['GenealogyTraverser'] = __DIR__ . '/Traverser.php';
 
 /**
  * Parser function
diff --git a/Person.php b/Person.php
index 33ebabe..e3e4c9f 100644
--- a/Person.php
+++ b/Person.php
@@ -19,6 +19,15 @@
}
 
/**
+* Get some basic info about this person.
+* @todo Add dates.
+* @return string
+*/
+   public function __toString() {
+   return $this->getTitle()->getPrefixedText();
+   }
+
+   /**
 * Get this person's wiki title.
 *
 * @return Title
diff --git a/README.md b/README.md
index 6412e98..e3d98e1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 Its first two parameters are unnamed (i.e. don't have equals signs), but all
 others must be (dates, etc.).
 
-The following functions are supported, three for defining data and three for
+The following functions are supported, three for defining data and four for
 reporting data:
 
 1. Define this person's dates.
@@ -21,6 +21,9 @@
`{{#genealogy:partners}}`
 6. List all children:

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ied75b1fe7075832b90492d3f5d50e421a1b58e94
---
M .gitignore
1 file changed, 20 insertions(+), 6 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 1228fd6..f453a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,24 @@
-*~
-*.kate-swp
-.*.swp
-\#*#
-.#*
-
 NormalizationTest.txt
 node_modules/
 vendor/
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied75b1fe7075832b90492d3f5d50e421a1b58e94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
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...TitleBlacklist[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ia8411b3ab318ad95282c874dfdff397c7984d0e6
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 90b2321..2217456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8411b3ab318ad95282c874dfdff397c7984d0e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
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...TorBlock[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ife47389214c951d5f990ee8f0767a0e2aa387493
---
M .gitignore
1 file changed, 22 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 4bf4869..a6ce8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 node_modules/
+/composer.lock
+/vendor/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife47389214c951d5f990ee8f0767a0e2aa387493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...ParserFunctions[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Id0bb960d7885ba9bc4fdb6d64c3ddf9ddf0169dc
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 90b2321..2217456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0bb960d7885ba9bc4fdb6d64c3ddf9ddf0169dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
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...UserMerge[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ia523fbdf684488f8063a2d9b7c8014a8285c4ae5
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 0a78e72..322df57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 node_modules/
 composer.lock
 vendor/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia523fbdf684488f8063a2d9b7c8014a8285c4ae5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...Interwiki[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I2a47f2abbc48ed7a95d229cef678747694d145b5
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index f51d002..5ef4d9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,24 @@
 /composer.lock
 /vendor/
-*~
-*.kate-swp
-.*.swp
 .idea
 node_modules/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a47f2abbc48ed7a95d229cef678747694d145b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...WikiEditor[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321199

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I97be186cda3e2b858b2604da80eb3f993fd056cf
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/99/321199/1

diff --git a/.gitignore b/.gitignore
index b4919db..9f2da68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 composer.lock
 vendor
 node_modules/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97be186cda3e2b858b2604da80eb3f993fd056cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
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...UserMerge[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321197

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ia523fbdf684488f8063a2d9b7c8014a8285c4ae5
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 0a78e72..322df57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 node_modules/
 composer.lock
 vendor/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia523fbdf684488f8063a2d9b7c8014a8285c4ae5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
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...TorBlock[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321196

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ife47389214c951d5f990ee8f0767a0e2aa387493
---
M .gitignore
1 file changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 4bf4869..a6ce8ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 node_modules/
+/composer.lock
+/vendor/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife47389214c951d5f990ee8f0767a0e2aa387493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TorBlock
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...TitleBlacklist[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321195

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ia8411b3ab318ad95282c874dfdff397c7984d0e6
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 90b2321..2217456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8411b3ab318ad95282c874dfdff397c7984d0e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
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...Scribunto[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321192

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ied75b1fe7075832b90492d3f5d50e421a1b58e94
---
M .gitignore
1 file changed, 20 insertions(+), 6 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 1228fd6..f453a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,24 @@
-*~
-*.kate-swp
-.*.swp
-\#*#
-.#*
-
 NormalizationTest.txt
 node_modules/
 vendor/
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied75b1fe7075832b90492d3f5d50e421a1b58e94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
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...Thanks[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321194

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ia3dad0c12c7598194946c84cc064a2f514eda766
---
M .gitignore
1 file changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 735f570..c11f71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,23 @@
 composer.lock
 vendor
 doc
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3dad0c12c7598194946c84cc064a2f514eda766
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
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...Math[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321189

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I5e275167937fac192ef8c1afbe2747edef5f3bd3
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 8e0248e..6896af3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,27 @@
-.svn
 .DS_Store
-*~
-*.kate-swp
-.*.swp
 /nbproject/private/
 tests/browser/.bundle
 tests/browser/.gem
 node_modules/
 vendor
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e275167937fac192ef8c1afbe2747edef5f3bd3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
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...ParserFunctions[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321190

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Id0bb960d7885ba9bc4fdb6d64c3ddf9ddf0169dc
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 90b2321..2217456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0bb960d7885ba9bc4fdb6d64c3ddf9ddf0169dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
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...Gadgets[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I65afe486373f81ed8fa2503e4b772387a9002458
---
M .gitignore
1 file changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 7a33d76..7b293a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,25 @@
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65afe486373f81ed8fa2503e4b772387a9002458
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
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...Cite[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I3e86feac9651f49d267b7ca9063039ed89f9d8d3
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 4284dfa..4489bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e86feac9651f49d267b7ca9063039ed89f9d8d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
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...GlobalUsage[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I5ed3e26c0d527ae3979f9fdb9baee87763d468f4
---
M .gitignore
1 file changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index f2d9ddd..a91338d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
+/vendor/
+node_modules/
+/composer.lock
 /nbproject/private/node_modules/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ed3e26c0d527ae3979f9fdb9baee87763d468f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...CiteThisPage[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Id6011692c4bcaf9196cca43173069b5bfdb964a3
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 4284dfa..4489bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6011692c4bcaf9196cca43173069b5bfdb964a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CiteThisPage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...cldr[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ibe0be2706974a4b733e4a280c1813ecc215c6e61
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index e9fa978..a0f9a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,26 @@
-*~
-*.kate-swp
-.*.swp
 .idea
 core
 core.zip
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe0be2706974a4b733e4a280c1813ecc215c6e61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/cldr
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...CodeEditor[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ifac0b3271923f70382899eb8d3c89daf2b5ab382
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 5bb8f99..f4a48da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,24 @@
-*~
-*.kate-swp
-.*.swp
 node_modules/
 vendor/
 ace-git/
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifac0b3271923f70382899eb8d3c89daf2b5ab382
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: TheDJ 
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...MediaWikiFarm[master]: Added special configuration to force a loading mechanism

2016-11-13 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321187

Change subject: Added special configuration to force a loading mechanism
..

Added special configuration to force a loading mechanism

Sometimes it is mandatory to use require_once, particularly when an extension is
required by a second extension is require_once-only. I recently encounter the 
case for:
* Translate (require_once-only) and UniversalLanguageSelector (bi-loading, but 
required by Translate)
* BlueSpiceFoundation (bi-loading but required by BlueSpiceExtensions 
(require_once-only)
Obviously this will change in the future and this feature will become unuseful, 
but for now
it is really needed.

Change-Id: Ib7dde20a0b780d9e80a788e4000916971e3a08b3
---
M src/MediaWikiFarm.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/LoadingTest.php
M tests/phpunit/data/config/extensionssettings.php
M tests/phpunit/data/config/testextensionsfarmversions.php
5 files changed, 54 insertions(+), 12 deletions(-)


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

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 77dbdcd..2bb6be9 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1296,31 +1296,43 @@
 
# Search for skin and extension activation
foreach( $settings as $setting => $value ) {
-   if( preg_match( '/^wgUse(Extension|Skin)(.+)$/', 
$setting, $matches ) && $value === true ) {
+   if( preg_match( '/^wgUse(Extension|Skin)(.+)$/', 
$setting, $matches ) && ( $value === true || $value == 'require_once' || $value 
== 'composer' ) ) {
 
$type = strtolower( $matches[1] );
$name = $matches[2];
$loadingMechanism = 
$this->detectLoadingMechanism( $type, $name );
+   if( $value !== true ) {
+   $loadingMechanism = $value;
+   }
 
if( is_null( $loadingMechanism ) ) {
$settings[$setting] = false;
} else {
$this->configuration[$type.'s'][$name] 
= $loadingMechanism;
+   $settings[preg_replace( 
'/[^a-zA-Z0-9_\x7f\xff]/', '', $setting )] = true;
}
}
-   elseif( preg_match( '/^wgUse(.+)$/', $setting, $matches 
) && $value === true ) {
+   elseif( preg_match( '/^wgUse(.+)$/', $setting, $matches 
) && ( $value === true || $value == 'require_once' || $value == 'composer' ) ) {
 
$name = $matches[1];
 
$loadingMechanism = 
$this->detectLoadingMechanism( 'extension', $name );
if( !is_null( $loadingMechanism ) ) {
+   if( $value !== true ) {
+   $loadingMechanism = $value;
+   }

$this->configuration['extensions'][$name] = $loadingMechanism;

$settings['wgUseExtension'.preg_replace( '/[^a-zA-Z0-9_\x7f\xff]/', '', $name 
)] = true;
+   unset( $settings[$setting] );
} else {
$loadingMechanism = 
$this->detectLoadingMechanism( 'skin', $name );
if( !is_null( $loadingMechanism ) ) {
+   if( $value !== true ) {
+   $loadingMechanism = 
$value;
+   }

$this->configuration['skins'][$name] = $loadingMechanism;

$settings['wgUseSkin'.preg_replace( '/[^a-zA-Z0-9_\x7f\xff]/', '', $name )] = 
true;
+   unset( $settings[$setting] );
}
}
}
diff --git a/tests/phpunit/ConfigurationTest.php 
b/tests/phpunit/ConfigurationTest.php
index 7bd539f..c9cd346 100644
--- a/tests/phpunit/ConfigurationTest.php
+++ b/tests/phpunit/ConfigurationTest.php
@@ -158,6 +158,39 @@
$this->assertEquals( 'wfLoadExtension', 
$extensions['TestExtensionBiLoading'] );
$this->assertEquals( 'wfLoadExtension', 
$extensions['TestExtensionWfLoadExtension'] );
$this->assertEquals( 'wfLoadExtension', 
$extensions['MediaWikiFarm'] );
+
+   # Now with

[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ib87cf703f2aa8971eaf63dcde5a5b0f6963235ba
---
M .gitignore
1 file changed, 18 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index f9037de..0676034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
 /composer.lock
 /node_modules/
 /vendor/
-*~
+
+# Editors
 *.kate-swp
+*~
+\#*#
+.#*
 .*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87cf703f2aa8971eaf63dcde5a5b0f6963235ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...AbuseFilter[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ib49e3cf79757630e7c380e30b6015029b7ec37be
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 2b7c2a4..3361170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,24 @@
-*~
-*.kate-swp
-.*.swp
 /extensions/
 /vendor/
 node_modules/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49e3cf79757630e7c380e30b6015029b7ec37be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
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...CentralAuth[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I47b2924d00d24d9f79b0e874ade89b9c37aa0c74
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 1eeda6f..0ecbd5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,24 @@
-*~
-*.kate-swp
-.*.swp
 composer.lock
 /nbproject/private/
 /node_modules
 /vendor
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47b2924d00d24d9f79b0e874ade89b9c37aa0c74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
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...GlobalUsage[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321186

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I5ed3e26c0d527ae3979f9fdb9baee87763d468f4
---
M .gitignore
1 file changed, 23 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index f2d9ddd..a91338d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,24 @@
-.svn
-*~
-*.kate-swp
-.*.swp
+/vendor/
+node_modules/
+/composer.lock
 /nbproject/private/node_modules/
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ed3e26c0d527ae3979f9fdb9baee87763d468f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
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...Gadgets[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321184

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I65afe486373f81ed8fa2503e4b772387a9002458
---
M .gitignore
1 file changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/84/321184/1

diff --git a/.gitignore b/.gitignore
index 7a33d76..7b293a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,25 @@
-*~
-*.kate-swp
-.*.swp
 .idea
 /node_modules/
 /vendor/
 /composer.lock
+
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65afe486373f81ed8fa2503e4b772387a9002458
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
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...FlaggedRevs[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321183

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I739ebe8df35544c3ec129fcc851255cdc0d41675
---
M .gitignore
1 file changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 4bf4869..b606fe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 node_modules/
+/vendor/
+/composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I739ebe8df35544c3ec129fcc851255cdc0d41675
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
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...CodeEditor[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321181

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ifac0b3271923f70382899eb8d3c89daf2b5ab382
---
M .gitignore
1 file changed, 20 insertions(+), 3 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 5bb8f99..f4a48da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,24 @@
-*~
-*.kate-swp
-.*.swp
 node_modules/
 vendor/
 ace-git/
 composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifac0b3271923f70382899eb8d3c89daf2b5ab382
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
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...CategoryTree[master]: Expand .gitignore for more editors

2016-11-13 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Expand .gitignore for more editors
..


Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I8d815840a2bf1b1a1c3d6717d1c9c428a2a278f8
---
M .gitignore
1 file changed, 22 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 4bf4869..0d3be55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
+/vendor/
 node_modules/
+/composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d815840a2bf1b1a1c3d6717d1c9c428a2a278f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...Cite[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321178

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I3e86feac9651f49d267b7ca9063039ed89f9d8d3
---
M .gitignore
1 file changed, 20 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 4284dfa..4489bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
 /node_modules/
 /vendor/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e86feac9651f49d267b7ca9063039ed89f9d8d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
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...CheckUser[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321177

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ib87cf703f2aa8971eaf63dcde5a5b0f6963235ba
---
M .gitignore
1 file changed, 18 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index f9037de..0676034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
 /composer.lock
 /node_modules/
 /vendor/
-*~
+
+# Editors
 *.kate-swp
+*~
+\#*#
+.#*
 .*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib87cf703f2aa8971eaf63dcde5a5b0f6963235ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
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...CategoryTree[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321175

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: I8d815840a2bf1b1a1c3d6717d1c9c428a2a278f8
---
M .gitignore
1 file changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 4bf4869..0d3be55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
-.svn
-*~
-*.kate-swp
-.*.swp
+/vendor/
 node_modules/
+/composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+.buildpath
+.classpath
+.settings
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d815840a2bf1b1a1c3d6717d1c9c428a2a278f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
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...AbuseFilter[master]: Expand .gitignore for more editors

2016-11-13 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321173

Change subject: Expand .gitignore for more editors
..

Expand .gitignore for more editors

List is from mediawiki/core

Change-Id: Ib49e3cf79757630e7c380e30b6015029b7ec37be
---
M .gitignore
1 file changed, 17 insertions(+), 3 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 2b7c2a4..ca7a305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,21 @@
-*~
-*.kate-swp
-.*.swp
 /extensions/
 /vendor/
 node_modules/
 /composer.lock
+
+# Editors
+*.kate-swp
+*~
+\#*#
+.#*
+.*.swp
+.project
+cscope.files
+cscope.out
+*.orig
+## NetBeans
+nbproject*
+project.index
+## Sublime
+sublime-*
+sftp-config.json

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib49e3cf79757630e7c380e30b6015029b7ec37be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
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...Wikidata[master]: New Wikidata Build - 2016-11-13T10:00:01+0000

2016-11-13 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321172

Change subject: New Wikidata Build - 2016-11-13T10:00:01+
..

New Wikidata Build - 2016-11-13T10:00:01+

Change-Id: I27074664ec6c5b8c135511675511ee9ed1eccf3b
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/fr.json
M extensions/ArticlePlaceholder/i18n/ko.json
M extensions/ArticlePlaceholder/i18n/ku-latn.json
M extensions/ArticlePlaceholder/i18n/lb.json
M extensions/ArticlePlaceholder/i18n/lt.json
M extensions/ArticlePlaceholder/i18n/mk.json
M extensions/ArticlePlaceholder/i18n/pt.json
M extensions/ArticlePlaceholder/i18n/ru.json
A extensions/ArticlePlaceholder/i18n/tl.json
M extensions/ArticlePlaceholder/i18n/uk.json
M extensions/ArticlePlaceholder/i18n/zh-hans.json
M extensions/Wikibase/lib/i18n/bn.json
M extensions/Wikibase/lib/i18n/ko.json
M extensions/Wikibase/lib/i18n/uk.json
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/ku-latn.json
M extensions/Wikibase/repo/i18n/uk.json
A extensions/WikimediaBadges/i18n/sv.json
M vendor/composer/installed.json
20 files changed, 73 insertions(+), 35 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 3251001..2622f5d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -797,12 +797,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "8ca786fa0e02339dd8b86f37fac8bbf17d768a59"
+"reference": "63c9b3e63734aa873e98d505c85ceb769d7e911b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/8ca786fa0e02339dd8b86f37fac8bbf17d768a59;,
-"reference": "8ca786fa0e02339dd8b86f37fac8bbf17d768a59",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/63c9b3e63734aa873e98d505c85ceb769d7e911b;,
+"reference": "63c9b3e63734aa873e98d505c85ceb769d7e911b",
 "shasum": ""
 },
 "require-dev": {
@@ -827,7 +827,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-11-11 21:51:00"
+"time": "2016-11-12 21:47:05"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1584,12 +1584,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c6c8310cb251c24247354a217e24e9fd83c3494d"
+"reference": "185e3619abc7a49abec564a1bd2d85b5b4c4f876"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c6c8310cb251c24247354a217e24e9fd83c3494d;,
-"reference": "c6c8310cb251c24247354a217e24e9fd83c3494d",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/185e3619abc7a49abec564a1bd2d85b5b4c4f876;,
+"reference": "185e3619abc7a49abec564a1bd2d85b5b4c4f876",
 "shasum": ""
 },
 "require": {
@@ -1663,7 +1663,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-11-11 22:01:48"
+"time": "2016-11-12 22:00:10"
 },
 {
 "name": "wikibase/wikimedia-badges",
@@ -1671,7 +1671,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaBadges;,
-"reference": "2142f185c708a3e449189d03af06d2eb9bb3c6bd"
+"reference": "77a28f9d9a74c1797f3f53dae4106ce4aee9f15a"
 },
 "require": {
 "php": ">=5.3.0"
@@ -1705,7 +1705,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-11-05 21:59:33"
+"time": "2016-11-12 22:00:52"
 },
 {
 "name": "wikimedia/assert",
diff --git a/extensions/ArticlePlaceholder/i18n/fr.json 
b/extensions/ArticlePlaceholder/i18n/fr.json
index b2d1e23..e2298d6 100644
--- a/extensions/ArticlePlaceholder/i18n/fr.json
+++ b/extensions/ArticlePlaceholder/i18n/fr.json
@@ -13,7 +13,7 @@
"articleplaceholder-abouttopic-entityid": "Veuillez entrer un ID 
d'élément comme

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: there was no more update of the cache when the origin f...

2016-11-13 Thread Seb35 (Code Review)

Seb35 has submitted this change and it was merged.

Change subject: Bug: there was no more update of the cache when the origin file 
changed
..


Bug: there was no more update of the cache when the origin file changed

This worked in the first place, but was lost at some time

Change-Id: Ideddbf3eaaafa1cfde822ccce413fda7afaf4408
---
M src/MediaWikiFarm.php
M src/main.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index f6e8885..77dbdcd 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -918,7 +918,7 @@
}
 
# Populate from cache
-   if( $this->cacheDir && is_file( $this->cacheDir . '/' . 
$cacheFile ) ) {
+   if( !$force && $this->cacheDir && is_file( $this->cacheDir . 
'/' . $cacheFile ) ) {
$this->configuration = $this->readFile( $cacheFile, 
$this->cacheDir );
return;
}
diff --git a/src/main.php b/src/main.php
index b3588b8..e1a0eea 100644
--- a/src/main.php
+++ b/src/main.php
@@ -24,7 +24,7 @@
 }
 
 # Compile MediaWiki configuration
-$wgMediaWikiFarm->getMediaWikiConfig();
+$wgMediaWikiFarm->getMediaWikiConfig( true );
 
 # Load skins with the require_once mechanism
 foreach( $wgMediaWikiFarm->getConfiguration( 'skins' ) as $skin => $value ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ideddbf3eaaafa1cfde822ccce413fda7afaf4408
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Seb35 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: there was no more update of the cache when the origin f...

2016-11-13 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321171

Change subject: Bug: there was no more update of the cache when the origin file 
changed
..

Bug: there was no more update of the cache when the origin file changed

This worked in the first place, but was lost at some time

Change-Id: Ideddbf3eaaafa1cfde822ccce413fda7afaf4408
---
M src/MediaWikiFarm.php
M src/main.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index f6e8885..77dbdcd 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -918,7 +918,7 @@
}
 
# Populate from cache
-   if( $this->cacheDir && is_file( $this->cacheDir . '/' . 
$cacheFile ) ) {
+   if( !$force && $this->cacheDir && is_file( $this->cacheDir . 
'/' . $cacheFile ) ) {
$this->configuration = $this->readFile( $cacheFile, 
$this->cacheDir );
return;
}
diff --git a/src/main.php b/src/main.php
index b3588b8..e1a0eea 100644
--- a/src/main.php
+++ b/src/main.php
@@ -24,7 +24,7 @@
 }
 
 # Compile MediaWiki configuration
-$wgMediaWikiFarm->getMediaWikiConfig();
+$wgMediaWikiFarm->getMediaWikiConfig( true );
 
 # Load skins with the require_once mechanism
 foreach( $wgMediaWikiFarm->getConfiguration( 'skins' ) as $skin => $value ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ideddbf3eaaafa1cfde822ccce413fda7afaf4408
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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

96 matches

Mail list logo