date:20160613

[MediaWiki-commits] [Gerrit] Limit the number of gray interlanguage links to 3 - change (mediawiki...ContentTranslation)

2016-06-13 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Limit the number of gray interlanguage links to 3
..

Limit the number of gray interlanguage links to 3

Bug: T137769
Change-Id: I5f076e757a6a895b21116631910ceff10f3467a2
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js 
b/modules/entrypoint/ext.cx.interlanguagelink.js
index e99dd25..62908a4 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -116,7 +116,9 @@
}
 
function prepareCXInterLanguageLinks( availableTargetLanguages ) {
-   var $newItem, $pLangList, dependencies, 
suggestedTargetLanguages;
+   var $newItem, $pLangList, dependencies, 
suggestedTargetLanguages,
+   count = 0,
+   maxListSize = 3;
 
suggestedTargetLanguages = getSuggestedTargetLanguages( 
availableTargetLanguages );
 
@@ -150,6 +152,10 @@
left: cxEntryPointDialogLeft,
entryPointName: campaign
} );
+   count++;
+   if ( count === maxListSize ) {
+   return false;
+   }
}
} );
} );

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

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

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

[MediaWiki-commits] [Gerrit] apertium-swe-dan: Initial Debian packaging - change (operations...apertium-swe-dan)

2016-06-13 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-swe-dan: Initial Debian packaging
..

apertium-swe-dan: Initial Debian packaging

Bug: T137767
Change-Id: Ib5caaed99d23725a7cedcd5730b72f5a6476d938
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 118 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe-dan
 refs/changes/48/294248/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..4d0e5c0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,12 @@
+apertium-swe-dan (0.7.0~r66063-1+wmf1) jessie; urgency=low
+
+  * Rebuilt for Jessie.
+
+ -- Kartik Mistry   Tue, 14 Jun 2016 11:22:14 +0530
+
+apertium-swe-dan (0.7.0~r66063-1) unstable; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release (Closes: #816105)
+
+ -- Kartik Mistry   Tue, 01 Mar 2016 12:24:40 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..1e6a4bb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: apertium-swe-dan
+Section: science
+Priority: optional
+Maintainer: Debian Science Team 

+Uploaders: Tino Didriksen ,
+   Kartik Mistry 
+Build-Depends: apertium-dan (>= 0.4.0~r66063),
+   apertium-dev (>= 3.4),
+   apertium-lex-tools,
+   apertium-swe (>= 0.5.0~r66062),
+   autotools-dev,
+   cg3,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.7
+Homepage: http://apertium.org/
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe-dan.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe-dan.git
+
+Package: apertium-swe-dan
+Architecture: all
+Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-da-sv, apertium-dan-swe, apertium-sv-da
+Conflicts: apertium-da-sv, apertium-dan-swe, apertium-sv-da
+Replaces: apertium-da-sv, apertium-sv-da
+Description: Apertium translation data for the Swedish-Danish pair
+ Data package providing Apertium language resources for translating
+ between the Swedish and Danish languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..5945334
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,52 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2015-2016, Kevin Brubeck Unhammer 
+   2012-2015, Per Tunedal
+   2008-2016, Francis Tyers 
+   2009-2010, Jacob Nordfalk 
+   2008-2009, Michael Kristensen
+   2005-2009, Universitat d'Alacant (Transducens group)
+License: GPL-2+
+
+Files: autogen.sh
+Copyright: 2002, Daniel Elstner  
+License: GPL-2
+
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-2+
+
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete

[MediaWiki-commits] [Gerrit] Use navigator.languages as fallback for mw.uls.getAcceptLang... - change (mediawiki...UniversalLanguageSelector)

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

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

Change subject: Use navigator.languages as fallback for 
mw.uls.getAcceptLanguageList
..


Use navigator.languages as fallback for mw.uls.getAcceptLanguageList

Follow up: Ib603f836f59f7078ac5dbb73b84ca358cb43
Bug: T137522
Change-Id: Ia5de997fe393ce99a91b16ed397811391a85bc59
---
M resources/js/ext.uls.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 5fd58ee..9fbd63d 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -128,7 +128,7 @@
};
 
mw.uls.getAcceptLanguageList = function () {
-   return mw.config.get( 'wgULSAcceptLanguageList' ) || [];
+   return mw.config.get( 'wgULSAcceptLanguageList' ) || 
window.navigator.languages || [];
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5de997fe393ce99a91b16ed397811391a85bc59
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove PHPVersionError, deprecated and unused since 1.25 - change (mediawiki/core)

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

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

Change subject: Remove PHPVersionError, deprecated and unused since 1.25
..


Remove PHPVersionError, deprecated and unused since 1.25

Change-Id: Id6637886dc1d5ce3a13c9ba23dd23e76b2168eba
---
D includes/PHPVersionError.php
1 file changed, 0 insertions(+), 26 deletions(-)

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



diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
deleted file mode 100644
index 9fbcf89..000
--- a/includes/PHPVersionError.php
+++ /dev/null
@@ -1,26 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @deprecated 1.25
- * @file
- */
-// @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound
-require_once dirname( __FILE__ ) . '/PHPVersionCheck.php';
-// @codingStandardsIgnoreEnd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6637886dc1d5ce3a13c9ba23dd23e76b2168eba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable lazy loaded images on Ukranian and Farsi Wikipedias - change (operations/mediawiki-config)

2016-06-13 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Enable lazy loaded images on Ukranian and Farsi Wikipedias
..

Enable lazy loaded images on Ukranian and Farsi Wikipedias

Target some medium sized wikis to expose us to greater levels of feedback
and NavigationTiming data.

Bug: T134003
Change-Id: I8cc62deb17aaa93be761124a5deaddebd18fab26
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 62c0ffe..a62a55e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14241,6 +14241,16 @@
'base' => true,
'beta' => true,
],
+   // T134003
+   'fawiki' => [
+'base' => true,
+'beta' => true,
+
+   ],
+   'ukwiki' => [
+   'base' => true,
+   'beta' => true,
+   ],
 ],
 'wgMFLazyLoadReferences' => [
'default' => [

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

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

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

[MediaWiki-commits] [Gerrit] SpecialTranslationStats: Use TranslateUtils::getLanguageNames - change (mediawiki...Translate)

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

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

Change subject: SpecialTranslationStats: Use TranslateUtils::getLanguageNames
..


SpecialTranslationStats: Use TranslateUtils::getLanguageNames

Change-Id: Iecb58bf1231fbd909ca3eded54559376777d7f9f
---
M specials/SpecialTranslationStats.php
1 file changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/specials/SpecialTranslationStats.php 
b/specials/SpecialTranslationStats.php
index 2fe65d8..6829389 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -305,14 +305,7 @@
 * @return JsSelectToInput
 */
protected function languageSelector() {
-   if ( is_callable( array( 'LanguageNames', 'getNames' ) ) ) {
-   $languages = LanguageNames::getNames( 
$this->getLanguage()->getCode(),
-   LanguageNames::FALLBACK_NORMAL,
-   LanguageNames::LIST_MW_AND_CLDR
-   );
-   } else {
-   $languages = Language::fetchLanguageNames();
-   }
+   $languages = TranslateUtils::getLanguageNames( 
$this->getLanguage()->getCode() );
 
ksort( $languages );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb58bf1231fbd909ca3eded54559376777d7f9f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Restore OverlayManager tests and move back to mobile.startup... - change (mediawiki...MobileFrontend)

2016-06-13 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Restore OverlayManager tests and move back to mobile.startup 
library
..

Restore OverlayManager tests and move back to mobile.startup library

Modules prefixed with `skins.` are not pulled into the unit test environment
(only things prefixed `mobile.` are). These modules have side effects that can 
break
other unit tests.

Although currently the only consumer of the OverlayManager is 
skins.minerva.scripts
OOjs UI has a WindowManager that we will have to merge at some point. Thus 
keeping
it separated in the mobile.startup module is desirable (since the goal is for 
OOjs UI
to replace this eventually)

Made corrections to the unit test so that it uses a class to create rather than 
an instance
(not the upper case O in OverlayManager)

Follow up to I6517b7c4f6c9d69ebdd0d1fc1cd3c390dcaaa75f
Bug: T134908
Change-Id: I4b36867bc37c9bfc699f9495d9b76ed4e908f959
---
M extension.json
R resources/mobile.startup/OverlayManager.js
M resources/skins.minerva.scripts/preInit.js
R tests/qunit/mobile.startup/test_OverlayManager.js
4 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/extension.json b/extension.json
index fbc76d8..4cf6556 100644
--- a/extension.json
+++ b/extension.json
@@ -636,7 +636,8 @@
"resources/mobile.startup/Section.js",
"resources/mobile.startup/Thumbnail.js",
"resources/mobile.startup/Page.js",
-   "resources/mobile.startup/Skin.js"
+   "resources/mobile.startup/Skin.js",
+   "resources/mobile.startup/OverlayManager.js"
],
"position": "bottom"
},
@@ -1630,7 +1631,6 @@
"mobile-frontend-cookies-required"
],
"scripts": [
-   
"resources/skins.minerva.scripts/OverlayManager.js",
"resources/skins.minerva.scripts/preInit.js",
"resources/skins.minerva.scripts/init.js",

"resources/skins.minerva.scripts/initLogging.js",
diff --git a/resources/skins.minerva.scripts/OverlayManager.js 
b/resources/mobile.startup/OverlayManager.js
similarity index 98%
rename from resources/skins.minerva.scripts/OverlayManager.js
rename to resources/mobile.startup/OverlayManager.js
index 53da7f2..c0a9a6b 100644
--- a/resources/skins.minerva.scripts/OverlayManager.js
+++ b/resources/mobile.startup/OverlayManager.js
@@ -242,6 +242,6 @@
}
} );
 
-   M.define( 'skins.minerva.scripts/OverlayManager', OverlayManager );
+   M.define( 'mobile.startup/OverlayManager', OverlayManager );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/resources/skins.minerva.scripts/preInit.js 
b/resources/skins.minerva.scripts/preInit.js
index 63ad997..3c62d0b 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -7,7 +7,7 @@
  */
 ( function ( M, $ ) {
var currentPage, skin,
-   OverlayManager = M.require( 
'skins.minerva.scripts/OverlayManager' ),
+   OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
overlayManager = new OverlayManager( require( 
'mediawiki.router' ) ),
PageGateway = M.require( 'mobile.startup/PageGateway' ),
gateway = new PageGateway( new mw.Api() ),
diff --git a/tests/qunit/skins.minerva.scripts/test_OverlayManager.js 
b/tests/qunit/mobile.startup/test_OverlayManager.js
similarity index 98%
rename from tests/qunit/skins.minerva.scripts/test_OverlayManager.js
rename to tests/qunit/mobile.startup/test_OverlayManager.js
index d1a44a6..ea5c9ed 100644
--- a/tests/qunit/skins.minerva.scripts/test_OverlayManager.js
+++ b/tests/qunit/mobile.startup/test_OverlayManager.js
@@ -1,5 +1,5 @@
 ( function ( M, $ ) {
-   var OverlayManager = M.require( 'skins.minerva.scripts/overlayManager' 
),
+   var OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
fakeRouter, overlayManager;
 
QUnit.module( 'MobileFrontend mobile.startup/OverlayManager', {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b36867bc37c9bfc699f9495d9b76ed4e908f959
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Avoid FOUC when marking page for translation - change (mediawiki...Translate)

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

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

Change subject: Avoid FOUC when marking page for translation
..


Avoid FOUC when marking page for translation

Moved the CSS to a separate module and use addModuleStyles.

Change-Id: I1927d5a3f59ff650eefbd0d94635b964eedacb44
---
M Resources.php
M tag/SpecialPageTranslation.php
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/Resources.php b/Resources.php
index 738acfe..b558260 100644
--- a/Resources.php
+++ b/Resources.php
@@ -399,7 +399,6 @@
 
 $wgResourceModules['ext.translate.special.pagetranslation'] = array(
'scripts' => 'resources/js/ext.translate.special.pagetranslation.js',
-   'styles' => 'resources/css/ext.translate.special.pagetranslation.css',
'dependencies' => array(
'ext.translate.multiselectautocomplete',
'mediawiki.ui.button',
@@ -409,6 +408,11 @@
'position' => 'top',
 ) + $resourcePaths;
 
+$wgResourceModules['ext.translate.special.pagetranslation.styles'] = array(
+   'styles' => 'resources/css/ext.translate.special.pagetranslation.css',
+   'position' => 'top',
+) + $resourcePaths;
+
 $wgResourceModules['ext.translate.special.searchtranslations'] = array(
'scripts' => 'resources/js/ext.translate.special.searchtranslations.js',
'dependencies' => array(
diff --git a/tag/SpecialPageTranslation.php b/tag/SpecialPageTranslation.php
index 7cdaa81..20053f5 100644
--- a/tag/SpecialPageTranslation.php
+++ b/tag/SpecialPageTranslation.php
@@ -171,6 +171,8 @@
$request = $this->getRequest();
$out = $this->getOutput();
 
+   $out->addModuleStyles( 
'ext.translate.special.pagetranslation.styles' );
+
if ( $revision === 0 ) {
// Get the latest revision
$revision = (int)$title->getLatestRevID();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1927d5a3f59ff650eefbd0d94635b964eedacb44
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apertium-swe-nor: Initial Debian packaging - change (operations...apertium-swe-nor)

2016-06-13 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-swe-nor: Initial Debian packaging
..

apertium-swe-nor: Initial Debian packaging

Bug: T137767
Change-Id: Id2929c6cc5195a870857efe4c04305285d687d00
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 108 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe-nor
 refs/changes/45/294245/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b392a2e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,12 @@
+apertium-swe-nor (0.2.0~r69544-1+wmf1) jessie; urgency=low
+
+  * Rebuild for Jessie.
+
+ -- Kartik Mistry   Tue, 14 Jun 2016 10:31:40 +0530
+
+apertium-swe-nor (0.2.0~r69544-1) unstable; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release (Closes: #826706)
+
+ -- Kartik Mistry   Wed, 08 Jun 2016 17:27:48 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..c3ca9ec
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,34 @@
+Source: apertium-swe-nor
+Section: science
+Priority: optional
+Maintainer: Debian Science Team 

+Uploaders: Tino Didriksen ,
+   Kartik Mistry 
+Build-Depends: apertium-dev (>= 3.4.2~r68466),
+   apertium-lex-tools,
+   apertium-nno (>= 0.9.0~r69513),
+   apertium-nob (>= 0.9.0~r69513),
+   apertium-swe (>= 0.7.0~r69513),
+   autotools-dev,
+   cg3,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.8
+Homepage: http://apertium.org/
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe-nor.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe-nor.git
+
+Package: apertium-swe-nor
+Architecture: all
+Depends: apertium (>= 3.4.2~r68466),
+ apertium-lex-tools,
+ cg3,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: apertium-nor-swe
+Conflicts: apertium-nor-swe
+Description: Apertium translation data for the Swedish-Norwegian pair
+ Data package providing Apertium language resources for translating
+ between the Swedish and Norwegian languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..52a1b4d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright:  2011, Nathan Maxson
+   2011-2013, Francis M. Tyers 
+   2011-2014, Jonathan N. Washington 

+   2012-2014, Ilnar Salimzyan 
+   2012-2014, Kevin Brubeck Unhammer 
+2013, Qdinar 
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 

+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be

[MediaWiki-commits] [Gerrit] apertium-swe: Initial Debian packaging - change (operations...apertium-swe)

2016-06-13 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: apertium-swe: Initial Debian packaging
..

apertium-swe: Initial Debian packaging

Bug: T137767
Change-Id: I1d2cb16c42b280cd8cbad06c680006fee897bbe6
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 96 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-swe
 refs/changes/44/294244/1

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..43aa887
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,29 @@
+apertium-swe (0.7.0~r69513-1+wmf1) jessie; urgency=low
+
+  * Rebuild for Jessie.
+
+ -- Kartik Mistry   Tue, 14 Jun 2016 10:13:14 +0530
+
+apertium-swe (0.7.0~r69513-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Tino Didriksen   Wed, 08 Jun 2016 09:10:01 +0200
+
+apertium-swe (0.6.0~r68541-1) unstable; urgency=low
+
+  [ Tino Didriksen ]
+  * New upstream release
+
+  [ Kartik Mistry ]
+  * debian/control:
++ Updated Standards-Version to 3.9.8
+
+ -- Kartik Mistry   Wed, 08 Jun 2016 11:44:53 +0530
+
+apertium-swe (0.5.0~r66062-1) unstable; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release (Closes: #816400)
+
+ -- Kartik Mistry   Tue, 01 Mar 2016 21:34:10 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..1da6d10
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,22 @@
+Source: apertium-swe
+Section: science
+Priority: optional
+Maintainer: Debian Science Team 

+Uploaders: Tino Didriksen , Kartik Mistry 

+Build-Depends: apertium-dev (>= 3.4),
+   autotools-dev,
+   cg3,
+   debhelper (>= 9),
+   dh-autoreconf,
+   gawk,
+   pkg-config (>= 0.21)
+Standards-Version: 3.9.8
+Homepage: http://apertium.org/
+Vcs-Git: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-swe.git
+
+Package: apertium-swe
+Architecture: all
+Depends: apertium (>= 3.4), cg3, ${misc:Depends}, ${shlibs:Depends}
+Description: Apertium single language data for Swedish
+ Data package providing Apertium language resources for Swedish
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..bfab647
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2013-2016, Kevin Brubeck Unhammer 
+2013, Francis M. Tyers 
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..c12d371
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+export DH_OPTIONS
+export LC_ALL=C.UTF-8
+
+%:
+   dh $@ --fail-missing --with autoreconf
+
+override_dh_auto_test:
+   # Disable test for now
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..ae2eb58
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=filenamemangle=s/\S*download=//g \
+https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/apertium/apertium-swe
 \
+.*=apertium-swe(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
To view,

[MediaWiki-commits] [Gerrit] Do not output accept language list if it might get cached - change (mediawiki...UniversalLanguageSelector)

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

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

Change subject: Do not output accept language list if it might get cached
..


Do not output accept language list if it might get cached

Bug: T137522
Change-Id: Ib603f836f59f7078ac5dbb73b84ca358cb43
---
M UniversalLanguageSelector.hooks.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index ea648df..6326246 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -344,8 +344,14 @@
 * @return bool
 */
public static function addVariables( &$vars, OutputPage $out ) {
+   global $wgULSAnonCanChangeLanguage;
+
// Place request context dependent stuff here
-   $vars['wgULSAcceptLanguageList'] = array_keys( 
$out->getRequest()->getAcceptLang() );
+
+   // Do not output accept languages if there is risk it will get 
cached accross requests
+   if ( $wgULSAnonCanChangeLanguage || 
$out->getUser()->isLoggedIn() ) {
+   $vars['wgULSAcceptLanguageList'] = array_keys( 
$out->getRequest()->getAcceptLang() );
+   }
 
// An optimization to avoid loading all of uls.data just to get 
the autonym
$langCode = $out->getLanguage()->getCode();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib603f836f59f7078ac5dbb73b84ca358cb43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use navigator.languages as fallback for mw.uls.getAcceptLang... - change (mediawiki...UniversalLanguageSelector)

2016-06-13 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Use navigator.languages as fallback for 
mw.uls.getAcceptLanguageList
..

Use navigator.languages as fallback for mw.uls.getAcceptLanguageList

Follow up: Ib603f836f59f7078ac5dbb73b84ca358cb43
Bug: T137522

Change-Id: Ia5de997fe393ce99a91b16ed397811391a85bc59
---
M resources/js/ext.uls.init.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/43/294243/1

diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 5fd58ee..9fbd63d 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -128,7 +128,7 @@
};
 
mw.uls.getAcceptLanguageList = function () {
-   return mw.config.get( 'wgULSAcceptLanguageList' ) || [];
+   return mw.config.get( 'wgULSAcceptLanguageList' ) || 
window.navigator.languages || [];
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5de997fe393ce99a91b16ed397811391a85bc59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] FormatMetadata: Use binary integer literals instead of bindec() - change (mediawiki/core)

2016-06-13 Thread PleaseStand (Code Review)

PleaseStand has uploaded a new change for review.

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

Change subject: FormatMetadata: Use binary integer literals instead of bindec()
..

FormatMetadata: Use binary integer literals instead of bindec()

We can do this now that we have dropped support for PHP 5.3.

Change-Id: I1e78249e244105496e976bf01e35f4067410b2f0
---
M includes/media/FormatMetadata.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/294242/1

diff --git a/includes/media/FormatMetadata.php 
b/includes/media/FormatMetadata.php
index 5fbdcc7..78b0296 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -418,12 +418,12 @@
 
case 'Flash':
$flashDecode = [
-   'fired' => $val & 
bindec( '0001' ),
-   'return' => ( $val & 
bindec( '0110' ) ) >> 1,
-   'mode' => ( $val & 
bindec( '00011000' ) ) >> 3,
-   'function' => ( $val & 
bindec( '0010' ) ) >> 5,
-   'redeye' => ( $val & 
bindec( '0100' ) ) >> 6,
-   // 'reserved' => ( $val 
& bindec( '1000' ) ) >> 7,
+   'fired' => $val & 
0b0001,
+   'return' => ( $val & 
0b0110 ) >> 1,
+   'mode' => ( $val & 
0b00011000 ) >> 3,
+   'function' => ( $val & 
0b0010 ) >> 5,
+   'redeye' => ( $val & 
0b0100 ) >> 6,
+   // 'reserved' => ( $val 
& 0b1000 ) >> 7,
];
$flashMsgs = [];
# We do not need to handle 
unknown values since all are used.

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

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

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

[MediaWiki-commits] [Gerrit] Bump version to 2.0-1 to denote that XSS is fixed - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Bump version to 2.0-1 to denote that XSS is fixed
..


Bump version to 2.0-1 to denote that XSS is fixed

Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
---
M MsCalendar.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/MsCalendar.php b/MsCalendar.php
index b21ca72..b0600a1 100755
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -3,7 +3,7 @@
 $wgExtensionCredits['parserhook'][] = array(
'name' => 'MsCalendar',
'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.0',
+   'version' => '2.0-1',
'descriptionmsg' => 'msc-desc',
'license-name' => 'GPLv2+',
'author' => array( '[mailto:w...@ratin.de Martin Schwindl]', 
'[mailto:w...@keyler-consult.de Martin Keyler]', 
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe 
Schenone]' ),
@@ -52,4 +52,4 @@
 $wgAjaxExportList[] = 'MsCalendar::saveNew';
 $wgAjaxExportList[] = 'MsCalendar::update';
 $wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+$wgAjaxExportList[] = 'MsCalendar::checkDB';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Sanitize before output instead of before input
..


Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 9f5fdd9..c80a508 100755
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -95,6 +95,14 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort ]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ ) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
+
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -188,4 +196,4 @@
this_dialog.remove();
}
}
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Fix XSS in extension
..


Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index 13882a6..afcecaa 100755
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -54,9 +54,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . 
'';
+   $output .= '' . wfMessage( 
'msc-today' )->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 
@@ -193,4 +193,4 @@
);
return json_encode( $data );
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump version to 2.0-1 to denote that XSS is fixed - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Bump version to 2.0-1 to denote that XSS is fixed
..

Bump version to 2.0-1 to denote that XSS is fixed

Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
---
M MsCalendar.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCalendar 
refs/changes/40/294240/1

diff --git a/MsCalendar.php b/MsCalendar.php
index b21ca72..b0600a1 100755
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -3,7 +3,7 @@
 $wgExtensionCredits['parserhook'][] = array(
'name' => 'MsCalendar',
'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.0',
+   'version' => '2.0-1',
'descriptionmsg' => 'msc-desc',
'license-name' => 'GPLv2+',
'author' => array( '[mailto:w...@ratin.de Martin Schwindl]', 
'[mailto:w...@keyler-consult.de Martin Keyler]', 
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe 
Schenone]' ),
@@ -52,4 +52,4 @@
 $wgAjaxExportList[] = 'MsCalendar::saveNew';
 $wgAjaxExportList[] = 'MsCalendar::update';
 $wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+$wgAjaxExportList[] = 'MsCalendar::checkDB';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix XSS in extension
..

Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCalendar 
refs/changes/38/294238/1

diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index 13882a6..afcecaa 100755
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -54,9 +54,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . 
'';
+   $output .= '' . wfMessage( 
'msc-today' )->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 
@@ -193,4 +193,4 @@
);
return json_encode( $data );
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Sanitize before output instead of before input
..

Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCalendar 
refs/changes/39/294239/1

diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 9f5fdd9..c80a508 100755
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -95,6 +95,14 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort ]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ ) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
+
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -188,4 +196,4 @@
this_dialog.remove();
}
}
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_25
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Bump version to 2.0-1 to denote that XSS is fixed - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Bump version to 2.0-1 to denote that XSS is fixed
..


Bump version to 2.0-1 to denote that XSS is fixed

Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
---
M MsCalendar.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/MsCalendar.php b/MsCalendar.php
index b21ca72..b0600a1 100755
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -3,7 +3,7 @@
 $wgExtensionCredits['parserhook'][] = array(
'name' => 'MsCalendar',
'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.0',
+   'version' => '2.0-1',
'descriptionmsg' => 'msc-desc',
'license-name' => 'GPLv2+',
'author' => array( '[mailto:w...@ratin.de Martin Schwindl]', 
'[mailto:w...@keyler-consult.de Martin Keyler]', 
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe 
Schenone]' ),
@@ -52,4 +52,4 @@
 $wgAjaxExportList[] = 'MsCalendar::saveNew';
 $wgAjaxExportList[] = 'MsCalendar::update';
 $wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+$wgAjaxExportList[] = 'MsCalendar::checkDB';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Sanitize before output instead of before input
..


Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 9f5fdd9..c80a508 100755
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -95,6 +95,14 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort ]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ ) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
+
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -188,4 +196,4 @@
this_dialog.remove();
}
}
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Fix XSS in extension
..


Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index 13882a6..afcecaa 100755
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -54,9 +54,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . 
'';
+   $output .= '' . wfMessage( 
'msc-today' )->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 
@@ -193,4 +193,4 @@
);
return json_encode( $data );
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix XSS in extension
..

Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index 13882a6..afcecaa 100755
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -54,9 +54,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . 
'';
+   $output .= '' . wfMessage( 
'msc-today' )->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 
@@ -193,4 +193,4 @@
);
return json_encode( $data );
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Bump version to 2.0-1 to denote that XSS is fixed - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Bump version to 2.0-1 to denote that XSS is fixed
..

Bump version to 2.0-1 to denote that XSS is fixed

Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
---
M MsCalendar.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/MsCalendar.php b/MsCalendar.php
index b21ca72..b0600a1 100755
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -3,7 +3,7 @@
 $wgExtensionCredits['parserhook'][] = array(
'name' => 'MsCalendar',
'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.0',
+   'version' => '2.0-1',
'descriptionmsg' => 'msc-desc',
'license-name' => 'GPLv2+',
'author' => array( '[mailto:w...@ratin.de Martin Schwindl]', 
'[mailto:w...@keyler-consult.de Martin Keyler]', 
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe 
Schenone]' ),
@@ -52,4 +52,4 @@
 $wgAjaxExportList[] = 'MsCalendar::saveNew';
 $wgAjaxExportList[] = 'MsCalendar::update';
 $wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+$wgAjaxExportList[] = 'MsCalendar::checkDB';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0243589bca54f9f6d2491f0a80ee432b62233be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Sanitize before output instead of before input
..

Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCalendar 
refs/changes/36/294236/1

diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 9f5fdd9..c80a508 100755
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -95,6 +95,14 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort ]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ ) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
+
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -188,4 +196,4 @@
this_dialog.remove();
}
}
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] T137406: Emit |- between thead/tbody/tfoot - change (mediawiki...parsoid)

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

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

Change subject: T137406: Emit |- between thead/tbody/tfoot
..


T137406: Emit |- between thead/tbody/tfoot

* Fixed a parser test that was using buggy wikitext all this time.
  Also, updated the test title with the expectation from this patch.
  Added a table caption as well.

Change-Id: I8073e5121d8856f6443a60739a7a6014a5537e9d
---
M HISTORY.md
M lib/html2wt/DOMHandlers.js
M tests/parserTests.txt
3 files changed, 46 insertions(+), 6 deletions(-)

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



diff --git a/HISTORY.md b/HISTORY.md
index bfa6d98..65c91e6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -8,6 +8,7 @@
   * T134389: Serialize content in HTML tables using HTML tags
   * T125419: Fix selser issues serializing first table row
   * T114413: Provide HTML2HTML endpoint in Parsoid
+  * T137406: Emit |- between thead/tbody/tfoot
 
 0.4.1 / 2015-09-17
 ==
diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index c93ab8f..0251251 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -690,13 +690,27 @@
tfoot: justChildren,
tr: {
handle: Promise.method(function(node, state, wrapperUnmodified) 
{
-   // If the token has 'startTagSrc' set, it means that 
the tr
-   // was present in the source wikitext and we emit it -- 
if not,
-   // we ignore it.
var dp = DU.getDataParsoid(node);
-   // ignore comments and ws
+   var needsTrWikitext = function() {
+   // If the token has 'startTagSrc' set, it means 
that the tr
+   // was present in the source wikitext and we 
emit it -- if not,
+   // we ignore it.
+   // ignore comments and ws
+   if (dp.startTagSrc || 
DU.previousNonSepSibling(node)) {
+   return true;
+   } else {
+   // If parent has a thead/tbody previous 
sibling, then
+   // we need the |- separation. But, a 
caption preceded
+   // this node's parent, all is good.
+   var parentSibling = 
DU.previousNonSepSibling(node.parentNode);
+
+   // thead/tbody/tfoot is always present 
around tr tags in the DOM.
+   return parentSibling && 
parentSibling.nodeName !== 'CAPTION';
+   }
+   };
+
var p;
-   if (DU.previousNonSepSibling(node) || dp.startTagSrc) {
+   if (needsTrWikitext()) {
p = serializeTableTag(dp.startTagSrc || "|-", 
'', state, node,

wrapperUnmodified).then(function(tableTag) {
WTSUtils.emitStartTag(tableTag, node, 
state);
@@ -704,6 +718,7 @@
} else {
p = Promise.resolve();
}
+
return p.then(function() {
return state.serializeChildren(node);
});
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index d4d43b1..afd06ca 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7083,11 +7083,12 @@
 !! end
 
 !! test
-Strip unsupported table tags
+Strip unsupported table tags, but introduce row wikitext as required
 !! options
 parsoid=html2wt
 !! html/parsoid
 
+Test
 
 
 Month
@@ -7113,10 +7114,12 @@
 
 !! wikitext
 {|
+|+Test
 
 !Month
 !Savings
 
+|-
 |January
 |$100
 
@@ -7124,10 +7127,31 @@
 |February
 |$80
 
+|-
 |Sum
 |$180
 
 |}
+!! html/php+tidy
+
+Test
+
+Month
+Savings
+
+
+January
+$100
+
+
+February
+$80
+
+
+Sum
+$180
+
+
 !! end
 
 !! test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8073e5121d8856f6443a60739a7a6014a5537e9d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump version of extension to 2.3 (Since XSS issue got fixed) - change (mediawiki...MsCalendar)

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

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

Change subject: Bump version of extension to 2.3 (Since XSS issue got fixed)
..


Bump version of extension to 2.3 (Since XSS issue got fixed)

Also remove having both old style and new style loader files, and
make the old style be a back-compat shim.

Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
(cherry picked from commit 9cdc85a6b2da9dc2d0015881bdca8a7a6b8d8a80)
---
M MsCalendar.php
M extension.json
2 files changed, 14 insertions(+), 61 deletions(-)

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



diff --git a/MsCalendar.php b/MsCalendar.php
index ca28c62..8286397 100644
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -1,61 +1,14 @@
  'MsCalendar',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.2',
-   'descriptionmsg' => 'msc-desc',
-   'license-name' => 'GPLv3',
-   'author' => array(
-   '[mailto:w...@ratin.de Martin Schwindl]',
-   '[mailto:w...@keyler-consult.de Martin Keyler]',
-   '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis 
Felipe Schenone]',
-   '[https://www.mediawiki.org/wiki/User:Fraifrai Frédéric 
Souchon]'
-   ),
-);
-
-$wgResourceModules['ext.MsCalendar'] = array(
-   'scripts' => array(
-   'js/jquery.calendario.js',
-   'js/MsCalendar.js'
-   ),
-   'styles' => 'MsCalendar.css',
-   'messages' => array(
-   'msc-desc',
-   'msc-notfirstday',
-   'msc-change',
-   'msc-remove',
-   'msc-create',
-   'msc-cancel',
-   'msc-eventname',
-   'msc-eventdate',
-   'msc-eventduration',
-   'msc-eventyearly',
-   'msc-eventedit',
-   'msc-eventcreate',
-   'msc-today',
-   'msc-todaylabel',
-   'msc-months',
-   'msc-days'
-   ),
-   'dependencies' => array(
-   'jquery.ui.dialog',
-   'jquery.ui.datepicker'
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsCalendar'
-);
-
-$wgAutoloadClasses['MsCalendar'] = __DIR__ . '/MsCalendar.body.php';
-
-$wgExtensionMessagesFiles['MsCalendar'] = __DIR__ . '/MsCalendar.i18n.php';
-$wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
-
-$wgHooks['ParserFirstCallInit'][] = 'MsCalendar::setHook';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'MsCalendar::updateDatabase';
-
-$wgAjaxExportList[] = 'MsCalendar::getMonth';
-$wgAjaxExportList[] = 'MsCalendar::saveNew';
-$wgAjaxExportList[] = 'MsCalendar::update';
-$wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'MsCalendar' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for MsCalendar extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the MsCalendar extension requires MediaWiki 
1.25+' );
+}
diff --git a/extension.json b/extension.json
index a19756c..e83bac7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsCalendar",
-   "version": "2.2",
+   "version": "2.3",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Sanitize before output instead of before input
..

Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
(cherry picked from commit a8b5c90f578b2ce0d15a283bcf4ace6a9712c1f1)
---
M js/MsCalendar.js
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCalendar 
refs/changes/33/294233/1

diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 5bb2fd7..740bad1 100644
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -89,6 +89,13 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort 
]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ 
) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -181,4 +188,4 @@
}
}
}); // each
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Bump version of extension to 2.3 (Since XSS issue got fixed) - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Bump version of extension to 2.3 (Since XSS issue got fixed)
..

Bump version of extension to 2.3 (Since XSS issue got fixed)

Also remove having both old style and new style loader files, and
make the old style be a back-compat shim.

Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
(cherry picked from commit 9cdc85a6b2da9dc2d0015881bdca8a7a6b8d8a80)
---
M MsCalendar.php
M extension.json
2 files changed, 14 insertions(+), 61 deletions(-)


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

diff --git a/MsCalendar.php b/MsCalendar.php
index ca28c62..8286397 100644
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -1,61 +1,14 @@
  'MsCalendar',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.2',
-   'descriptionmsg' => 'msc-desc',
-   'license-name' => 'GPLv3',
-   'author' => array(
-   '[mailto:w...@ratin.de Martin Schwindl]',
-   '[mailto:w...@keyler-consult.de Martin Keyler]',
-   '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis 
Felipe Schenone]',
-   '[https://www.mediawiki.org/wiki/User:Fraifrai Frédéric 
Souchon]'
-   ),
-);
-
-$wgResourceModules['ext.MsCalendar'] = array(
-   'scripts' => array(
-   'js/jquery.calendario.js',
-   'js/MsCalendar.js'
-   ),
-   'styles' => 'MsCalendar.css',
-   'messages' => array(
-   'msc-desc',
-   'msc-notfirstday',
-   'msc-change',
-   'msc-remove',
-   'msc-create',
-   'msc-cancel',
-   'msc-eventname',
-   'msc-eventdate',
-   'msc-eventduration',
-   'msc-eventyearly',
-   'msc-eventedit',
-   'msc-eventcreate',
-   'msc-today',
-   'msc-todaylabel',
-   'msc-months',
-   'msc-days'
-   ),
-   'dependencies' => array(
-   'jquery.ui.dialog',
-   'jquery.ui.datepicker'
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsCalendar'
-);
-
-$wgAutoloadClasses['MsCalendar'] = __DIR__ . '/MsCalendar.body.php';
-
-$wgExtensionMessagesFiles['MsCalendar'] = __DIR__ . '/MsCalendar.i18n.php';
-$wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
-
-$wgHooks['ParserFirstCallInit'][] = 'MsCalendar::setHook';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'MsCalendar::updateDatabase';
-
-$wgAjaxExportList[] = 'MsCalendar::getMonth';
-$wgAjaxExportList[] = 'MsCalendar::saveNew';
-$wgAjaxExportList[] = 'MsCalendar::update';
-$wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'MsCalendar' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for MsCalendar extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the MsCalendar extension requires MediaWiki 
1.25+' );
+}
diff --git a/extension.json b/extension.json
index a19756c..e83bac7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsCalendar",
-   "version": "2.2",
+   "version": "2.3",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Sanitize before output instead of before input
..


Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
(cherry picked from commit a8b5c90f578b2ce0d15a283bcf4ace6a9712c1f1)
---
M js/MsCalendar.js
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 5bb2fd7..740bad1 100644
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -89,6 +89,13 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort 
]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ 
) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -181,4 +188,4 @@
}
}
}); // each
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Fix XSS in extension
..


Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
(cherry picked from commit 51ba1112f546e4beb4507d54c4db7ea1daebe8a0)
---
M MsCalendar.body.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index b069fbc..386f188 100644
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -60,9 +60,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . '';
+   $output .= '' . wfMessage( 'msc-today' 
)->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix XSS in extension
..

Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
(cherry picked from commit 51ba1112f546e4beb4507d54c4db7ea1daebe8a0)
---
M MsCalendar.body.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index b069fbc..386f188 100644
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -60,9 +60,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . '';
+   $output .= '' . wfMessage( 'msc-today' 
)->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Bump version of extension to 2.3 (Since XSS issue got fixed) - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Bump version of extension to 2.3 (Since XSS issue got fixed)
..


Bump version of extension to 2.3 (Since XSS issue got fixed)

Also remove having both old style and new style loader files, and
make the old style be a back-compat shim.

Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
---
M MsCalendar.php
M extension.json
2 files changed, 14 insertions(+), 61 deletions(-)

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



diff --git a/MsCalendar.php b/MsCalendar.php
index ca28c62..8286397 100644
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -1,61 +1,14 @@
  'MsCalendar',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.2',
-   'descriptionmsg' => 'msc-desc',
-   'license-name' => 'GPLv3',
-   'author' => array(
-   '[mailto:w...@ratin.de Martin Schwindl]',
-   '[mailto:w...@keyler-consult.de Martin Keyler]',
-   '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis 
Felipe Schenone]',
-   '[https://www.mediawiki.org/wiki/User:Fraifrai Frédéric 
Souchon]'
-   ),
-);
-
-$wgResourceModules['ext.MsCalendar'] = array(
-   'scripts' => array(
-   'js/jquery.calendario.js',
-   'js/MsCalendar.js'
-   ),
-   'styles' => 'MsCalendar.css',
-   'messages' => array(
-   'msc-desc',
-   'msc-notfirstday',
-   'msc-change',
-   'msc-remove',
-   'msc-create',
-   'msc-cancel',
-   'msc-eventname',
-   'msc-eventdate',
-   'msc-eventduration',
-   'msc-eventyearly',
-   'msc-eventedit',
-   'msc-eventcreate',
-   'msc-today',
-   'msc-todaylabel',
-   'msc-months',
-   'msc-days'
-   ),
-   'dependencies' => array(
-   'jquery.ui.dialog',
-   'jquery.ui.datepicker'
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsCalendar'
-);
-
-$wgAutoloadClasses['MsCalendar'] = __DIR__ . '/MsCalendar.body.php';
-
-$wgExtensionMessagesFiles['MsCalendar'] = __DIR__ . '/MsCalendar.i18n.php';
-$wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
-
-$wgHooks['ParserFirstCallInit'][] = 'MsCalendar::setHook';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'MsCalendar::updateDatabase';
-
-$wgAjaxExportList[] = 'MsCalendar::getMonth';
-$wgAjaxExportList[] = 'MsCalendar::saveNew';
-$wgAjaxExportList[] = 'MsCalendar::update';
-$wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'MsCalendar' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for MsCalendar extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the MsCalendar extension requires MediaWiki 
1.25+' );
+}
diff --git a/extension.json b/extension.json
index a19756c..e83bac7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsCalendar",
-   "version": "2.2",
+   "version": "2.3",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Sanitize before output instead of before input
..


Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index bda1c2c..082c35a 100644
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -89,6 +89,13 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort 
]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ 
) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -167,12 +174,6 @@
yearly = this_dialog.find( 
'input[name="form_yearly"]' ).is( ':checked' ) ? 1 : 0,
bValid = true;
 
-   // Sanitize
-   inhalt = mw.html.escape( inhalt );
-   datum = mw.html.escape( datum );
-   event_id = mw.html.escape( event_id );
-   duration = mw.html.escape( duration );
-
if ( bValid ) {
//console.log( datum.val() );
$.get( mw.util.wikiScript(), {
@@ -187,4 +188,4 @@
}
}
}); // each
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump version of extension to 2.3 (Since XSS issue got fixed) - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Bump version of extension to 2.3 (Since XSS issue got fixed)
..

Bump version of extension to 2.3 (Since XSS issue got fixed)

Also remove having both old style and new style loader files, and
make the old style be a back-compat shim.

Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
---
M MsCalendar.php
M extension.json
2 files changed, 14 insertions(+), 61 deletions(-)


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

diff --git a/MsCalendar.php b/MsCalendar.php
index ca28c62..8286397 100644
--- a/MsCalendar.php
+++ b/MsCalendar.php
@@ -1,61 +1,14 @@
  'MsCalendar',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MsCalendar',
-   'version' => '2.2',
-   'descriptionmsg' => 'msc-desc',
-   'license-name' => 'GPLv3',
-   'author' => array(
-   '[mailto:w...@ratin.de Martin Schwindl]',
-   '[mailto:w...@keyler-consult.de Martin Keyler]',
-   '[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis 
Felipe Schenone]',
-   '[https://www.mediawiki.org/wiki/User:Fraifrai Frédéric 
Souchon]'
-   ),
-);
-
-$wgResourceModules['ext.MsCalendar'] = array(
-   'scripts' => array(
-   'js/jquery.calendario.js',
-   'js/MsCalendar.js'
-   ),
-   'styles' => 'MsCalendar.css',
-   'messages' => array(
-   'msc-desc',
-   'msc-notfirstday',
-   'msc-change',
-   'msc-remove',
-   'msc-create',
-   'msc-cancel',
-   'msc-eventname',
-   'msc-eventdate',
-   'msc-eventduration',
-   'msc-eventyearly',
-   'msc-eventedit',
-   'msc-eventcreate',
-   'msc-today',
-   'msc-todaylabel',
-   'msc-months',
-   'msc-days'
-   ),
-   'dependencies' => array(
-   'jquery.ui.dialog',
-   'jquery.ui.datepicker'
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'MsCalendar'
-);
-
-$wgAutoloadClasses['MsCalendar'] = __DIR__ . '/MsCalendar.body.php';
-
-$wgExtensionMessagesFiles['MsCalendar'] = __DIR__ . '/MsCalendar.i18n.php';
-$wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
-
-$wgHooks['ParserFirstCallInit'][] = 'MsCalendar::setHook';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'MsCalendar::updateDatabase';
-
-$wgAjaxExportList[] = 'MsCalendar::getMonth';
-$wgAjaxExportList[] = 'MsCalendar::saveNew';
-$wgAjaxExportList[] = 'MsCalendar::update';
-$wgAjaxExportList[] = 'MsCalendar::remove';
-$wgAjaxExportList[] = 'MsCalendar::checkDB';
\ No newline at end of file
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'MsCalendar' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['MsCalendar'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for MsCalendar extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the MsCalendar extension requires MediaWiki 
1.25+' );
+}
diff --git a/extension.json b/extension.json
index a19756c..e83bac7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "MsCalendar",
-   "version": "2.2",
+   "version": "2.3",
"author": [
"[mailto:w...@ratin.de Martin Schwindl]",
"[mailto:w...@keyler-consult.de Martin Keyler]",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If79695c2a69c0100195f93ea82cc6c3e3e2ff7b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Sanitize before output instead of before input - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Sanitize before output instead of before input
..

Sanitize before output instead of before input

Follow up 7c8b811c1

Bug: T133511
Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
---
M js/MsCalendar.js
1 file changed, 8 insertions(+), 7 deletions(-)


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

diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index bda1c2c..082c35a 100644
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -89,6 +89,13 @@
rs: 'MsCalendar::getMonth',
rsargs: [ month, year, calendarId, calendarSort 
]
}, function ( data ) {
+   for ( year in data ) {
+   for ( i = 0; i < data[year].length; i++ 
) {
+   for( items in data[year][i] ) {
+   data[year][i][items] = 
mw.html.escape( data[year][i][items] );
+   }
+   }
+   }
//console.log( data );
calendar.setData( data );
//console.log( calendar.caldata );
@@ -167,12 +174,6 @@
yearly = this_dialog.find( 
'input[name="form_yearly"]' ).is( ':checked' ) ? 1 : 0,
bValid = true;
 
-   // Sanitize
-   inhalt = mw.html.escape( inhalt );
-   datum = mw.html.escape( datum );
-   event_id = mw.html.escape( event_id );
-   duration = mw.html.escape( duration );
-
if ( bValid ) {
//console.log( datum.val() );
$.get( mw.util.wikiScript(), {
@@ -187,4 +188,4 @@
}
}
}); // each
-});
\ No newline at end of file
+});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606714c86023d2cf5b9d2202a341ecbce99863e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Made API more efficient and less prone to breakage. - change (mediawiki...VikiTitleIcon)

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

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

Change subject: Made API more efficient and less prone to breakage.
..


Made API more efficient and less prone to breakage.

Change-Id: I28229110ddcbc587055052a2d638ac12e927c6a9
---
M ApiGetTitleIcons.php
M VikiTitleIcon.php
M extension.json
M i18n/en.json
M i18n/qqq.json
5 files changed, 24 insertions(+), 99 deletions(-)

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



diff --git a/ApiGetTitleIcons.php b/ApiGetTitleIcons.php
index bc081fa..568d47d 100644
--- a/ApiGetTitleIcons.php
+++ b/ApiGetTitleIcons.php
@@ -30,113 +30,34 @@
$pageTitle = $this->getMain()->getVal( 'pageTitle' );
 
global $wgTitleIcon_TitleIconPropertyName;
-   $myTitleIconName = $wgTitleIcon_TitleIconPropertyName;
+   $titleIconProperty = $wgTitleIcon_TitleIconPropertyName;
 
-   $pageNameWithSpaces = str_replace( '_', ' ', $pageTitle );
-   $titleIconWithSpaces = str_replace( '+', ' ', $myTitleIconName 
);
+   $title = Title::newFromText( $pageTitle );
 
-   $api = new ApiMain(
-   new DerivativeRequest(
-   $this->getRequest(),
-   array(
-   'action' => 'askargs',
-   'conditions' => $pageTitle,
-   'printouts' => $titleIconWithSpaces
-   )
-   ),
-   false
-   );
+   $titleIconNames = $this->getPropertyValues( $title, 
$titleIconProperty );
 
-   $api->execute();
-   $data = $api->getResult()->getResultData(
-   null, ['BC' => [], 'Types' => [], 'Strip' => 'all'] );
-
-   if ( is_array( $data["query"]["results"] ) && count( 
$data["query"]["results"] ) == 0 ) {
-   $this->getResult()->addValue( null, 
$this->getModuleName(),
-   array( 'pageTitle' => $pageTitle,
-   'titleIcons' => array()
-   ) );
-
-   return true;
-   }
-
-   if ( array_key_exists( $pageNameWithSpaces, 
$data["query"]["results"] ) )
-   $titleIconNames = 
$data["query"]["results"]["$pageNameWithSpaces"]["printouts"]["$titleIconWithSpaces"];
-   else {
-   $key = array_shift( array_keys( 
$data["query"]["results"] ) );
-   $titleIconNames = 
$data["query"]["results"][$key]["printouts"]["$titleIconWithSpaces"];
-   }
-
-   if( count( $titleIconNames ) == 0 ) {
-   // If there are no title icons from the page, then get 
them from the page's categories
-
-   $api = new ApiMain(
-   new DerivativeRequest(
-   $this->getRequest(),
-   array(
-   'action' => 'query',
-   'titles' => $pageNameWithSpaces,
-   'prop' => 'categories'
-   )
-   ),
-   false
-   );
-
-   $api->execute();
-   $data = $api->getResult()->getResultData(
-   null, ['BC' => [], 'Types' => [], 'Strip' => 
'all'] );
-   $keys = array_keys( $data['query']['pages'] );
-   $key = array_shift( $keys );
-
-
-   if( array_key_exists( "categories", 
$data["query"]["pages"][$key]) ) {
-   $categories = array();
-   
foreach($data["query"]["pages"][$key]["categories"] as $categoryObject) {
-   $categories[] = 
$categoryObject["title"];
-   }
-
-   foreach( $categories as $category ) {
-   $title = Title::newFromText( $category 
);
-
-   $discoveredIcons = 
$this->getPropertyValues( $title, $titleIconWithSpaces );
-   foreach($discoveredIcons as $icon) {
-   $titleIconNames[] = $icon;
-   }
+   $categories = $title->getParentCategories();
+   foreach( $categories as $category ) {
+   $categoryTitle = Title::newFromText( $category );
+   $names =

[MediaWiki-commits] [Gerrit] Added missing API messages. - change (mediawiki...VIKI)

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

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

Change subject: Added missing API messages.
..


Added missing API messages.

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 6849a62..dc296d1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,5 +15,6 @@
"viki-error-intrawiki-out": "Error fetching intrawiki outgoing links 
for page: $1.",
"viki-error-intrawiki-in": "Error fetching intrawiki backlinks for 
page: $1.",
"viki-error-https-node": "Error elaborating node: $1. You are running 
over HTTPS; you can only access other wikis over HTTPS.",
-   "viki-error-https-namespace": "Error fetching content namespace for 
wiki: $1. You are running over HTTPS; you can only access other wikis over 
HTTPS."
+   "viki-error-https-namespace": "Error fetching content namespace for 
wiki: $1. You are running over HTTPS; you can only access other wikis over 
HTTPS.",
+   "apihelp-getContentNamespaces-description" : "Get the list of content 
namespaces for this wiki."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 37fd965..c23590b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,5 +16,6 @@
"viki-error-visit-node": "Error message for a failure to visit a node. 
See [[mw:Extension:VIKI]] for context.\nIt is apropriate to translate \"node\" 
by an equivalent of \"wiki page\" if better wording is not available.",
"viki-error-external-links": "Error message for a failure to fetch 
external links for a page",
"viki-error-intrawiki-out": "Error message for a failure to fetch 
intra-wiki links, that is ones that go from a wiki page to other pages in the 
same wiki.",
-   "viki-error-intrawiki-in": "Error message for a failure to fetch 
intra-wiki links to a page, that is links from other pages in this wiki to the 
page $1 in this wiki."
+   "viki-error-intrawiki-in": "Error message for a failure to fetch 
intra-wiki links to a page, that is links from other pages in this wiki to the 
page $1 in this wiki.",
+   "apihelp-getContentNamespaces-description" : 
"{{doc-apihelp-description|getContentNamespaces}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I381101ffd8a1d17cb24c09b605b1267758bff142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VIKI
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
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] Added missing API messages. - change (mediawiki...VIKI)

2016-06-13 Thread Cicalese (Code Review)

Cicalese has uploaded a new change for review.

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

Change subject: Added missing API messages.
..

Added missing API messages.

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 6849a62..dc296d1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,5 +15,6 @@
"viki-error-intrawiki-out": "Error fetching intrawiki outgoing links 
for page: $1.",
"viki-error-intrawiki-in": "Error fetching intrawiki backlinks for 
page: $1.",
"viki-error-https-node": "Error elaborating node: $1. You are running 
over HTTPS; you can only access other wikis over HTTPS.",
-   "viki-error-https-namespace": "Error fetching content namespace for 
wiki: $1. You are running over HTTPS; you can only access other wikis over 
HTTPS."
+   "viki-error-https-namespace": "Error fetching content namespace for 
wiki: $1. You are running over HTTPS; you can only access other wikis over 
HTTPS.",
+   "apihelp-getContentNamespaces-description" : "Get the list of content 
namespaces for this wiki."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 37fd965..c23590b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,5 +16,6 @@
"viki-error-visit-node": "Error message for a failure to visit a node. 
See [[mw:Extension:VIKI]] for context.\nIt is apropriate to translate \"node\" 
by an equivalent of \"wiki page\" if better wording is not available.",
"viki-error-external-links": "Error message for a failure to fetch 
external links for a page",
"viki-error-intrawiki-out": "Error message for a failure to fetch 
intra-wiki links, that is ones that go from a wiki page to other pages in the 
same wiki.",
-   "viki-error-intrawiki-in": "Error message for a failure to fetch 
intra-wiki links to a page, that is links from other pages in this wiki to the 
page $1 in this wiki."
+   "viki-error-intrawiki-in": "Error message for a failure to fetch 
intra-wiki links to a page, that is links from other pages in this wiki to the 
page $1 in this wiki.",
+   "apihelp-getContentNamespaces-description" : 
"{{doc-apihelp-description|getContentNamespaces}}"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I381101ffd8a1d17cb24c09b605b1267758bff142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VIKI
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

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

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

Change subject: Fix XSS in extension
..


Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index b069fbc..386f188 100644
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -60,9 +60,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . '';
+   $output .= '' . wfMessage( 'msc-today' 
)->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix XSS in extension - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix XSS in extension
..

Fix XSS in extension

Bug: T133511
Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
---
M MsCalendar.body.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/MsCalendar.body.php b/MsCalendar.body.php
index b069fbc..386f188 100644
--- a/MsCalendar.body.php
+++ b/MsCalendar.body.php
@@ -60,9 +60,9 @@
$output .= '';
$output .= '';
$output .= '';
-   $output .= '' . wfMessage( 'msc-today' ) . '';
+   $output .= '' . wfMessage( 'msc-today' 
)->parse() . '';
$output .= '';
-   $output .= '';
+   $output .= '';
return $output;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ead6364dd148838842ac92d025b61a448b3f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] Fix XSS vulnerability - change (mediawiki...MsCalendar)

2016-06-13 Thread Brian Wolff (Code Review)

Brian Wolff has submitted this change and it was merged.

Change subject: Fix XSS vulnerability
..


Fix XSS vulnerability

Bug: T133511

Change-Id: I32b022e8aa7412ff9f36dd7fc874830ef16635ed
---
M js/MsCalendar.js
1 file changed, 11 insertions(+), 5 deletions(-)

Approvals:
  Brian Wolff: Verified; Looks good to me, approved



diff --git a/js/MsCalendar.js b/js/MsCalendar.js
index 5bb2fd7..bda1c2c 100644
--- a/js/MsCalendar.js
+++ b/js/MsCalendar.js
@@ -160,19 +160,25 @@
if ( this_dialog.find( 'input[name="remove_event"]' 
).is( ':checked' ) ) {
rs_var = 'MsCalendar::remove';
}
-   var inhalt = this_dialog.find( 
'input[name="form_inhalt"]' ),
-   datum = this_dialog.find( 
'input[name="form_datum"]' ),
-   event_id = this_dialog.find( 
'input[name="form_id"]' ),
-   duration = this_dialog.find( 
'input[name="form_duration"]' ),
+   var inhalt = this_dialog.find( 
'input[name="form_inhalt"]' ).val(),
+   datum = this_dialog.find( 
'input[name="form_datum"]' ).val(),
+   event_id = this_dialog.find( 
'input[name="form_id"]' ).val(),
+   duration = this_dialog.find( 
'input[name="form_duration"]' ).val(),
yearly = this_dialog.find( 
'input[name="form_yearly"]' ).is( ':checked' ) ? 1 : 0,
bValid = true;
+
+   // Sanitize
+   inhalt = mw.html.escape( inhalt );
+   datum = mw.html.escape( datum );
+   event_id = mw.html.escape( event_id );
+   duration = mw.html.escape( duration );
 
if ( bValid ) {
//console.log( datum.val() );
$.get( mw.util.wikiScript(), {
action: 'ajax',
rs: rs_var,
-   rsargs: [ calendarId, datum.val(), 
inhalt.val(), event_id.val(), duration.val(), yearly ]
+   rsargs: [ calendarId, datum, inhalt, 
event_id, duration, yearly ]
}, function ( data ) {
loadMonth();
}, 'json' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32b022e8aa7412ff9f36dd7fc874830ef16635ed
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MsCalendar
Gerrit-Branch: master
Gerrit-Owner: Luis Felipe Schenone 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Luis Felipe Schenone 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] 4.7.8 & a half codebase ready for upgrade - change (wikimedia...crm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: 4.7.8 & a half codebase ready for upgrade
..

4.7.8 & a half codebase ready for upgrade

Change-Id: I2cd15ab5aa3cd366ccca80051e9c6bb6dda6719a
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/27/294227/1

diff --git a/civicrm b/civicrm
index 15b2cb2..71df358 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 15b2cb2c419029302c73622197527cc1184831cb
+Subproject commit 71df358d7d1c05dcb2b5ea3b421d27079830aef8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cd15ab5aa3cd366ccca80051e9c6bb6dda6719a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] 4.7.8 & a half codebase ready for upgrade - change (wikimedia...crm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: 4.7.8 & a half codebase ready for upgrade
..

4.7.8 & a half codebase ready for upgrade

Change-Id: Ie11fa608aed155fc57e99a56a8faa0331bf2a3f4
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/26/294226/1

diff --git a/civicrm b/civicrm
index 15b2cb2..71df358 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 15b2cb2c419029302c73622197527cc1184831cb
+Subproject commit 71df358d7d1c05dcb2b5ea3b421d27079830aef8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie11fa608aed155fc57e99a56a8faa0331bf2a3f4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Update tilerator to 8c0eb61 - change (maps...deploy)

2016-06-13 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Update tilerator to 8c0eb61
..

Update tilerator to 8c0eb61

List of changes:
8c0eb61 Process all files since last call
xxx Update node module dependencies

Change-Id: If66f60aa527b959437044c04e64c53c135f62afc
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M node_modules/debug/node_modules/ms/package.json
M node_modules/express/node_modules/send/node_modules/ms/package.json
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/lib/core.js
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M 
node_modules/kue/node_modules/stylus/node_modules/source-map/node_modules/amdefine/package.json
M node_modules/kue/node_modules/stylus/node_modules/source-map/package.json
M 
node_modules/kue/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json
M 
node_modules/kue/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rc/node_modules/minimist/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/strip-ansi/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/once/node_modules/wrappy/package.json
M node_modules/osm-bright-source/node_modules/postgis-vt-util/package.json
M node_modules/osm-bright-source/package.json
M node_modules/osm-bright-style/node_modules/osm-bright-fonts/package.json
M node_modules/osm-bright-style/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json
M 
node_modules/tilelive-vector/node_modules/s3urls/node_modules/minimist/package.json
M node_modules/tilerator-jobprocessor/index.js
M node_modules/tilerator-jobprocessor/lib/fileParser.js
A node_modules/tilerator-jobprocessor/lib/processAll.js
M node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/lib/core.js
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/node_modules/xmldoc/package.json
M 
node_modules/tilerator-jobprocessor/node_modules/kartotherian-core/package.json
M node_modules/tilerator-jobprocessor/node_modules/tmp/package.json
M node_modules/tilerator-jobprocessor/package.json
M node_modules/type-is/node_modules/media-typer/package.json
M src
43 files changed, 135 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/maps/tilerator/deploy 
refs/changes/25/294225/1

diff --git 
a/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
 
b/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
index 4010d03..077c122 100644
--- 
a/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
+++ 
b/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
@@ -67,5 +67,6 @@
 "tmp": "tmp/inflight-1.0.5.tgz_1463529611443_0.00041943578980863094"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz;
+  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz;,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
 
b/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
index ae20208..bb58dde 100644
---

[MediaWiki-commits] [Gerrit] Merge sandbox/adamw/4.7.8-wmf_dev into master - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge sandbox/adamw/4.7.8-wmf_dev into master
..


Merge sandbox/adamw/4.7.8-wmf_dev into master

152f7eef21d11412a464fbf345c605575d1aa34f CiviCRM 4.7.8 core code
e555e87aa901f5691374a9f0e626645fe2263023 Update CiviCRM to latest patches from 
master
1cff7fefef75479bf56f1bb36b8822682e8b3b42 WMF patches over latest master.
aaee68ddadb7a57cbd0ba4e8ff160b2455a5509c Remove autoload_static as it won't 
phplint on 5.3 for us.
84b50852d57c8289c37a19c0ee2e5044c5fa34d5 Knock out a couple of trait files coz 
php5.3

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62e9e5f9e83ffd319c28fefe59629a4c90ac0b12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge sandbox/adamw/4.7.8-wmf_dev into master - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Merge sandbox/adamw/4.7.8-wmf_dev into master
..

Merge sandbox/adamw/4.7.8-wmf_dev into master

152f7eef21d11412a464fbf345c605575d1aa34f CiviCRM 4.7.8 core code
e555e87aa901f5691374a9f0e626645fe2263023 Update CiviCRM to latest patches from 
master
1cff7fefef75479bf56f1bb36b8822682e8b3b42 WMF patches over latest master.
aaee68ddadb7a57cbd0ba4e8ff160b2455a5509c Remove autoload_static as it won't 
phplint on 5.3 for us.
84b50852d57c8289c37a19c0ee2e5044c5fa34d5 Knock out a couple of trait files coz 
php5.3

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/24/294224/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62e9e5f9e83ffd319c28fefe59629a4c90ac0b12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Remove custom version check from update.php clone - change (mediawiki...WikiLexicalData)

2016-06-13 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Remove custom version check from update.php clone
..

Remove custom version check from update.php clone

Already checked by Maintenance.php so no need for it. Also remove
unused $wgUseMasterForMaintenance while we're here

Change-Id: I581f0837025eeebd1935d6b3751c264f385f71ae
---
M maintenance/update.php
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/maintenance/update.php b/maintenance/update.php
index b7543d6..848334a 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -7,12 +7,6 @@
  * @ingroup Maintenance
  */
 
-if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), 
'5.3.2' ) < 0 ) ) {
-   require dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
-   wfPHPVersionError( 'cli' );
-}
-
-$wgUseMasterForMaintenance = true;
 // require_once( __DIR__ . '/../../../maintenance/update.php' );
 
 require_once( __DIR__ . '/../../../maintenance/maintenance.php' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I581f0837025eeebd1935d6b3751c264f385f71ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Remove unused and undocumented $wgUseMasterForMaintenance - change (mediawiki/core)

2016-06-13 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Remove unused and undocumented $wgUseMasterForMaintenance
..

Remove unused and undocumented $wgUseMasterForMaintenance

Change-Id: I32b58a869c796f5170fc61d6cedca9b07b7f5762
---
M maintenance/update.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/294222/1

diff --git a/maintenance/update.php b/maintenance/update.php
index 775fa7b..0103189 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -25,7 +25,6 @@
  * @ingroup Maintenance
  */
 
-$wgUseMasterForMaintenance = true;
 require_once __DIR__ . '/Maintenance.php';
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] Made API more efficient and less prone to breakage. - change (mediawiki...VikiTitleIcon)

2016-06-13 Thread Cicalese (Code Review)

Cicalese has uploaded a new change for review.

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

Change subject: Made API more efficient and less prone to breakage.
..

Made API more efficient and less prone to breakage.

Change-Id: I28229110ddcbc587055052a2d638ac12e927c6a9
---
M ApiGetTitleIcons.php
M VikiTitleIcon.php
M extension.json
3 files changed, 18 insertions(+), 97 deletions(-)


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

diff --git a/ApiGetTitleIcons.php b/ApiGetTitleIcons.php
index bc081fa..568d47d 100644
--- a/ApiGetTitleIcons.php
+++ b/ApiGetTitleIcons.php
@@ -30,113 +30,34 @@
$pageTitle = $this->getMain()->getVal( 'pageTitle' );
 
global $wgTitleIcon_TitleIconPropertyName;
-   $myTitleIconName = $wgTitleIcon_TitleIconPropertyName;
+   $titleIconProperty = $wgTitleIcon_TitleIconPropertyName;
 
-   $pageNameWithSpaces = str_replace( '_', ' ', $pageTitle );
-   $titleIconWithSpaces = str_replace( '+', ' ', $myTitleIconName 
);
+   $title = Title::newFromText( $pageTitle );
 
-   $api = new ApiMain(
-   new DerivativeRequest(
-   $this->getRequest(),
-   array(
-   'action' => 'askargs',
-   'conditions' => $pageTitle,
-   'printouts' => $titleIconWithSpaces
-   )
-   ),
-   false
-   );
+   $titleIconNames = $this->getPropertyValues( $title, 
$titleIconProperty );
 
-   $api->execute();
-   $data = $api->getResult()->getResultData(
-   null, ['BC' => [], 'Types' => [], 'Strip' => 'all'] );
-
-   if ( is_array( $data["query"]["results"] ) && count( 
$data["query"]["results"] ) == 0 ) {
-   $this->getResult()->addValue( null, 
$this->getModuleName(),
-   array( 'pageTitle' => $pageTitle,
-   'titleIcons' => array()
-   ) );
-
-   return true;
-   }
-
-   if ( array_key_exists( $pageNameWithSpaces, 
$data["query"]["results"] ) )
-   $titleIconNames = 
$data["query"]["results"]["$pageNameWithSpaces"]["printouts"]["$titleIconWithSpaces"];
-   else {
-   $key = array_shift( array_keys( 
$data["query"]["results"] ) );
-   $titleIconNames = 
$data["query"]["results"][$key]["printouts"]["$titleIconWithSpaces"];
-   }
-
-   if( count( $titleIconNames ) == 0 ) {
-   // If there are no title icons from the page, then get 
them from the page's categories
-
-   $api = new ApiMain(
-   new DerivativeRequest(
-   $this->getRequest(),
-   array(
-   'action' => 'query',
-   'titles' => $pageNameWithSpaces,
-   'prop' => 'categories'
-   )
-   ),
-   false
-   );
-
-   $api->execute();
-   $data = $api->getResult()->getResultData(
-   null, ['BC' => [], 'Types' => [], 'Strip' => 
'all'] );
-   $keys = array_keys( $data['query']['pages'] );
-   $key = array_shift( $keys );
-
-
-   if( array_key_exists( "categories", 
$data["query"]["pages"][$key]) ) {
-   $categories = array();
-   
foreach($data["query"]["pages"][$key]["categories"] as $categoryObject) {
-   $categories[] = 
$categoryObject["title"];
-   }
-
-   foreach( $categories as $category ) {
-   $title = Title::newFromText( $category 
);
-
-   $discoveredIcons = 
$this->getPropertyValues( $title, $titleIconWithSpaces );
-   foreach($discoveredIcons as $icon) {
-   $titleIconNames[] = $icon;
-   }
+   $categories = $title->getParentCategories();
+   foreach( $categories as $category ) {
+   $categoryTitle = Title::newFromText( $category );
+   $names

[MediaWiki-commits] [Gerrit] EntityUsageTable: Run all subqueries at once with UNION on M... - change (mediawiki...Wikibase)

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

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

Change subject: EntityUsageTable: Run all subqueries at once with UNION on MySQL
..


EntityUsageTable: Run all subqueries at once with UNION on MySQL

Manually tested.

NOTE: cannot be tested with unit tests, since the feature we are
trying to test (a UNION of many queries against the same table)
isn't supported by MySQL on temporary tables (which is what we 
use for database testing). This must ALWAYS be tested manually!

Bug: T137539
Change-Id: Ibaef26edf51dfb609bb8d97db2017adbed3b9766
---
M client/includes/Usage/Sql/EntityUsageTable.php
M client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
3 files changed, 50 insertions(+), 12 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  Daniel Kinzler: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/client/includes/Usage/Sql/EntityUsageTable.php 
b/client/includes/Usage/Sql/EntityUsageTable.php
index 62f25b6..b70a777 100644
--- a/client/includes/Usage/Sql/EntityUsageTable.php
+++ b/client/includes/Usage/Sql/EntityUsageTable.php
@@ -356,6 +356,36 @@
 * @return string[]
 */
private function getUsedEntityIdStrings( array $idStrings ) {
+   // Note: We need to use one (sub)query per entity here, per 
T116404
+   $subQueries = $this->getUsedEntityIdStringsQueries( $idStrings 
);
+
+   $values = [];
+   if ( $this->connection->getType() === 'mysql' ) {
+   // On MySQL we can UNION all queries and run them at 
once
+   $sql = $this->connection->unionQueries( $subQueries, 
false );
+
+   $res = $this->connection->query( $sql, __METHOD__ );
+   foreach ( $res as $row ) {
+   $values[] = $row->eu_entity_id;
+   }
+   } else {
+   foreach ( $subQueries as $sql ) {
+   $res = $this->connection->query( $sql, 
__METHOD__ );
+   if ( $res->numRows() ) {
+   $values[] = 
$res->current()->eu_entity_id;
+   }
+   }
+   }
+
+   return $values;
+   }
+
+   /**
+* @param string[] $idStrings
+*
+* @return string[]
+*/
+   private function getUsedEntityIdStringsQueries( array $idStrings ) {
$subQueries = [];
 
foreach ( $idStrings as $idString ) {
@@ -368,15 +398,7 @@
);
}
 
-   $values = [];
-   foreach ( $subQueries as $sql ) {
-   $res = $this->connection->query( $sql, __METHOD__ );
-   if ( $res->numRows() ) {
-   $values[] = $res->current()->eu_entity_id;
-   }
-   }
-
-   return $values;
+   return $subQueries;
}
 
/**
diff --git a/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php 
b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
index 31d6d35..473292b 100644
--- a/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
@@ -304,7 +304,15 @@
 
$this->assertEmpty( $usageTable->getUnusedEntities( array( $q4 
) ), 'Q4 should not be unused' );
 
-   $unused = $usageTable->getUnusedEntities( array( $q4, $q6 ) );
+   $entityIds = array( $q4, $q6 );
+   if ( wfGetDB( DB_SLAVE )->getType() === 'mysql' ) {
+   // On MySQL we use UNIONs on the table… as the table is 
temporary that
+   // doesn't work in unit tests.
+   // 
https://dev.mysql.com/doc/refman/5.7/en/temporary-table-problems.html
+   $entityIds = array( $q6 );
+   }
+
+   $unused = $usageTable->getUnusedEntities( $entityIds );
$this->assertCount( 1, $unused );
$this->assertEquals( $q6, reset( $unused ), 'Q6 should be 
unused' );
}
diff --git a/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php 
b/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
index 332a839..5dfad66 100644
--- a/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
+++ b/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php
@@ -170,9 +170,17 @@
 
Assert::assertEmpty( $this->lookup->getUnusedEntities( array( 
$q4 ) ), 'Q4 should not be unused' );
 
-   $unused = $this->lookup->getUnusedEntities( array( $q4, $q6 ) );
+   $entityIds = array( $q4,

[MediaWiki-commits] [Gerrit] Knock out a couple of trait files coz php5.3 - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Knock out a couple of trait files coz php5.3
..

Knock out a couple of trait files coz php5.3

Change-Id: I244c21b89bb48bf15cb5c4978228f0c54eead3aa
---
D vendor/psr/log/Psr/Log/LoggerAwareTrait.php
D vendor/psr/log/Psr/Log/LoggerTrait.php
D 
vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
3 files changed, 0 insertions(+), 188 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/20/294220/1

diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php 
b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
deleted file mode 100644
index f087a3d..000
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ /dev/null
@@ -1,22 +0,0 @@
-logger = $logger;
-}
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php 
b/vendor/psr/log/Psr/Log/LoggerTrait.php
deleted file mode 100644
index 5912496..000
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-log(LogLevel::EMERGENCY, $message, $context);
-}
-
-/**
- * Action must be taken immediately.
- *
- * Example: Entire website down, database unavailable, etc. This should
- * trigger the SMS alerts and wake you up.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function alert($message, array $context = array())
-{
-$this->log(LogLevel::ALERT, $message, $context);
-}
-
-/**
- * Critical conditions.
- *
- * Example: Application component unavailable, unexpected exception.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function critical($message, array $context = array())
-{
-$this->log(LogLevel::CRITICAL, $message, $context);
-}
-
-/**
- * Runtime errors that do not require immediate action but should typically
- * be logged and monitored.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function error($message, array $context = array())
-{
-$this->log(LogLevel::ERROR, $message, $context);
-}
-
-/**
- * Exceptional occurrences that are not errors.
- *
- * Example: Use of deprecated APIs, poor use of an API, undesirable things
- * that are not necessarily wrong.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function warning($message, array $context = array())
-{
-$this->log(LogLevel::WARNING, $message, $context);
-}
-
-/**
- * Normal but significant events.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function notice($message, array $context = array())
-{
-$this->log(LogLevel::NOTICE, $message, $context);
-}
-
-/**
- * Interesting events.
- *
- * Example: User logs in, SQL logs.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function info($message, array $context = array())
-{
-$this->log(LogLevel::INFO, $message, $context);
-}
-
-/**
- * Detailed debug information.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function debug($message, array $context = array())
-{
-$this->log(LogLevel::DEBUG, $message, $context);
-}
-
-/**
- * Logs with an arbitrary level.
- *
- * @param mixed $level
- * @param string $message
- * @param array $context
- * @return null
- */
-abstract public function log($level, $message, array $context = array());
-}
diff --git 
a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
 
b/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
deleted file mode 100644
index 57280aa..000
--- 
a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection;
-
-/**
- * ContainerAware trait.
- *
- * @author Fabien Potencier 
- */
-trait ContainerAwareTrait
-{
-/**
- * @var ContainerInterface
- */
-protected $container;
-
-/**
- * Sets the Container associated with this Controller.
- *
- * @param ContainerInterface $container A ContainerInterface instance
- */
-public function setContainer(ContainerInterface $container = null)
-{
-$this->container = $container;
-}

[MediaWiki-commits] [Gerrit] Remove autoload_static as it won't phplint on 5.3 for us. - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Remove autoload_static as it won't phplint on 5.3 for us.
..

Remove autoload_static as it won't phplint on 5.3 for us.

If we upgrade to php 5.6 we will need this back

Change-Id: I77c5362fb56fa3fb9d6ff2e37aa33de06ffd2d30
---
D vendor/composer/autoload_static.php
1 file changed, 0 insertions(+), 352 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/19/294219/1

diff --git a/vendor/composer/autoload_static.php 
b/vendor/composer/autoload_static.php
deleted file mode 100644
index 507dbb3..000
--- a/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,352 +0,0 @@
- __DIR__ . '/..' . 
'/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
-);
-
-public static $prefixLengthsPsr4 = array (
-'P' => 
-array (
-'PhpOffice\\PhpWord\\' => 18,
-),
-'C' => 
-array (
-'Civi\\Cxn\\Rpc\\' => 13,
-),
-);
-
-public static $prefixDirsPsr4 = array (
-'PhpOffice\\PhpWord\\' => 
-array (
-0 => __DIR__ . '/..' . '/phpoffice/phpword/src/PhpWord',
-),
-'Civi\\Cxn\\Rpc\\' => 
-array (
-0 => __DIR__ . '/..' . '/civicrm/civicrm-cxn-rpc/src',
-),
-);
-
-public static $prefixesPsr0 = array (
-'S' => 
-array (
-'System' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Symfony\\Component\\Process\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/process',
-),
-'Symfony\\Component\\Finder\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/finder',
-),
-'Symfony\\Component\\Filesystem\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/filesystem',
-),
-'Symfony\\Component\\EventDispatcher\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
-),
-'Symfony\\Component\\DependencyInjection\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/dependency-injection',
-),
-'Symfony\\Component\\Config\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/config',
-),
-),
-'P' => 
-array (
-'Psr\\Log\\' => 
-array (
-0 => __DIR__ . '/..' . '/psr/log',
-),
-'PHPUnit_' => 
-array (
-0 => __DIR__ . '/../..' . '/packages',
-),
-),
-'N' => 
-array (
-'Net' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'M' => 
-array (
-'Math' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'F' => 
-array (
-'File' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'C' => 
-array (
-'Crypt' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Civi\\' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-1 => __DIR__ . '/../..' . '/tests/phpunit',
-),
-'Civi' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-),
-'CA_Config' => 
-array (
-0 => __DIR__ . '/..' . '/totten/ca-config/src',
-),
-),
-);
-
-public static $classMap = array (
-'Absolute_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/absolute_positioner.cls.php',
-'Abstract_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/abstract_renderer.cls.php',
-'Adobe_Font_Metrics' => __DIR__ . '/..' . 
'/phenx/php-font-lib/classes/Adobe_Font_Metrics.php',
-'Attribute_Translator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/attribute_translator.cls.php',
-'Block_Frame_Decorator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_decorator.cls.php',
-'Block_Frame_Reflower' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_reflower.cls.php',
-'Block_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_positioner.cls.php',
-'Block_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_renderer.cls.php',
-'CPDF_Adapter' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/cpdf_adapter.cls.php',
-

[MediaWiki-commits] [Gerrit] WMF patches over latest master. - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: WMF patches over latest master.
..

WMF patches over latest master.

Includes all our not-yet-merged patches

I wanted to push the branches this is compiled from to gerrit but gerrit was 
less keen.

Patches reflect 2  patches in packages:
https://github.com/civicrm/civicrm-packages/compare/master...eileenmcnaughton:4.7.8?expand=1

And 25 patches here: (some of which are still in QA for 4.7.9)
https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:wmf-4.7.8?expand=1

 @eileenmcnaughton  wmf: CRM-17157 allow more than 2 decimal places in 
currency  …  2ca179f
 @eileenmcnaughton  wmf: CRM-10700 use DELETE FROM instead of TRUNCATE  …   
594acf1
 @eileenmcnaughton  wmf: CRM-17158 block empty searches unless deliberate  
…f7c3324
 @eileenmcnaughton  wmf-sunset patch add extra columns to contribution 
recur tab  … ddfaf47
 @eileenmcnaughton  wmf-sunset patch skip process greetings on contact 
create  …012052b
 @adamwight Merge from master :Include custom fields in default 
export  …   9bdd572
 @adamwight Don't create SQL function at runtime  … 
9562633
 eileen Return more rows per query and use unbuffered query to 
manage the memory  … 4bc658b
 eileen Increase time out while doing exports  …
c069fd9
 (QA 4.7.9) eileen  needs review CRM-17154 wmf-gr report actions 
improvement  … c3dc5b3
 @eileenmcnaughton  Deployment file adds: gitreview, settings.location, 
readme, submodules  …   73af99e
 (does not alter deployed) Add script for compiling deployment repo  …  
02bab90
 eileen Hack for running GenCode  … ba5b1ba
 (QA 4.7.9) eileen  CRM-18681 respect api permissions flag on batch merge 
job   8d830e9
 (QA 4.7.9) eileen  Cleanup a couple of unused vars 7534660
 (QA 4.7.9) eileen  Make the changes John suggested last time, so the tests 
don't break E…  …   2b55947
 (QA 4.7.9) eileen  CRM-18685 Batch merge - custom data not treated as a 
conflict - resul…  …   d335217
 (QA 4.7.9) eileen  CRM-18674 fix date merging for view_only custom fields  
7ca2b85
 (QA 4.7.9) eileen  CRM-18761 fix for dodgey date revert
9e2d509
 eileen quick hack to group safety  …   3ec11c3
 (QA 4.7.9) eileen  To be upstreamed - further custom data perms issue  …   
05f6d29
 eileen Fix another slow point  …   97b2340
 (perf - need to fix better upstream) @eileenmcnaughton Revert "add smartGroup 
title in select clause"  …   e576613
 @eileenmcnaughton  eileenmcnaughtonwmf-sunset-patch alter 
exception behaviour  …   84a3a6c

Change-Id: Ia73b03e8a394756d05dba63fe3ce6e6019afa252
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contact/BAO/Query.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/Search.php
M CRM/Core/BAO/PrevNextCache.php
M CRM/Core/Config.php
M CRM/Core/DAO.php
M CRM/Core/Error.php
M CRM/Core/Form.php
M CRM/Core/Menu.php
M CRM/Core/OptionValue.php
M CRM/Core/Session.php
M CRM/Core/TableHierarchy.php
M CRM/Core/TemporaryErrorScope.php
M CRM/Dedupe/BAO/Rule.php
M CRM/Dedupe/BAO/RuleGroup.php
M CRM/Dedupe/Finder.php
M CRM/Dedupe/Merger.php
M CRM/Export/BAO/Export.php
M CRM/Logging/Reverter.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Detail.php
M CRM/Report/Form/Instance.php
M CRM/Utils/Rule.php
M api/v3/Job.php
M packages/DB/common.php
M packages/DB/mysql.php
A settings_location.php
M templates/CRM/Report/Form.tpl
M templates/CRM/Report/Form/Actions.tpl
A templates/CRM/common/tasks.tpl
33 files changed, 303 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/18/294218/1

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 11ac3d3..1cc0ea1 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -158,11 +158,11 @@
 // CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache"); // Transaction-safe
 if (CRM_Core_Transaction::isActive()) {
   
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, 
function () {
-CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache");
   });
 }
 else {
-

[MediaWiki-commits] [Gerrit] Update CiviCRM to latest patches from master - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Update CiviCRM to latest patches from master
..

Update CiviCRM to latest patches from master

This commit includes the patches to be included in 4.7.9 (in July 2016) such as 
have already been merged.
Some of them are ones we want - including the merge of 'My reports'. I am going 
to put our customisations
into a follow up commit for clarity.

Change-Id: I563e02536af0c806afc49a99ab9092a89c32aac5
---
M CRM/ACL/Page/ACL.php
M CRM/ACL/Page/ACLBasic.php
M CRM/Activity/Form/Activity.php
M CRM/Activity/Form/Task/SearchTaskHookSample.php
M CRM/Activity/Page/AJAX.php
M CRM/Admin/Form/LocationType.php
M CRM/Admin/Form/PaymentProcessor.php
M CRM/Admin/Form/PaymentProcessorType.php
M CRM/Admin/Form/Setting/Date.php
M CRM/Admin/Form/Setting/Miscellaneous.php
M CRM/Badge/BAO/Layout.php
M CRM/Campaign/BAO/Survey.php
M CRM/Case/BAO/Case.php
M CRM/Case/Form/Activity.php
M CRM/Case/Form/Task/SearchTaskHookSample.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/Contact/Utils.php
M CRM/Contact/BAO/Query.php
M CRM/Contact/BAO/Relationship.php
M CRM/Contact/Form/Contact.php
M CRM/Contact/Form/Edit/Address.php
M CRM/Contact/Form/Search/Custom/ActivitySearch.php
M CRM/Contact/Form/Task/PDFLetterCommon.php
M CRM/Contact/Form/Task/SMSCommon.php
M CRM/Contact/Import/Parser/Contact.php
M CRM/Contact/Page/AJAX.php
M CRM/Contact/Task.php
M CRM/Contribute/BAO/Contribution.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/CancelSubscription.php
M CRM/Contribute/Form/Contribution/Main.php
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/Dashboard.php
M CRM/Core/BAO/LabelFormat.php
M CRM/Core/BAO/LocationType.php
M CRM/Core/BAO/Navigation.php
M CRM/Core/BAO/PaperSize.php
M CRM/Core/BAO/PdfFormat.php
M CRM/Core/BAO/SchemaHandler.php
M CRM/Core/BAO/Tag.php
M CRM/Core/Config/MagicMerge.php
M CRM/Core/Payment.php
M CRM/Core/Payment/AuthorizeNet.php
M CRM/Core/Payment/Elavon.php
M CRM/Core/SelectValues.php
M CRM/Core/xml/Menu/Admin.xml
M CRM/Custom/Form/CustomDataByType.php
M CRM/Custom/Form/Field.php
M CRM/Custom/Import/Form/DataSource.php
M CRM/Event/BAO/Event.php
M CRM/Event/BAO/Participant.php
M CRM/Event/Form/Participant.php
M CRM/Event/Form/Registration/Confirm.php
M CRM/Event/Form/SelfSvcTransfer.php
M CRM/Event/Form/SelfSvcUpdate.php
M CRM/Event/Form/Task/Batch.php
M CRM/Event/Form/Task/ParticipantStatus.php
M CRM/Event/Form/Task/SearchTaskHookSample.php
M CRM/Export/BAO/Export.php
M CRM/Financial/BAO/ExportFormat/IIF.php
M CRM/Grant/BAO/Grant.php
M CRM/Grant/Form/Task/SearchTaskHookSample.php
M CRM/Import/Form/DataSource.php
M CRM/Mailing/BAO/Mailing.php
M CRM/Mailing/Event/BAO/Queue.php
M CRM/Mailing/Event/BAO/TrackableURLOpen.php
M CRM/Mailing/Event/BAO/Unsubscribe.php
M CRM/Mailing/Form/Component.php
M CRM/Mailing/Form/Subscribe.php
M CRM/Member/BAO/MembershipPayment.php
M CRM/Member/BAO/MembershipStatus.php
M CRM/Member/BAO/Query.php
M CRM/Member/Task.php
M CRM/Price/BAO/LineItem.php
M CRM/Price/BAO/PriceSet.php
M CRM/Report/BAO/ReportInstance.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Recur.php
M CRM/Report/Form/Instance.php
M CRM/Report/Info.php
M CRM/Report/Page/InstanceList.php
A CRM/Utils/PDF/Document.php
M CRM/Utils/ReCAPTCHA.php
M CRM/Utils/Recent.php
M ang/crmMailing.css
M ang/crmMailing/BlockReview.html
M ang/crmMailing/BlockReview.js
M ang/crmMailing/EditMailingCtrl/2step.html
M ang/crmMailing/EditMailingCtrl/wizard.html
M ang/crmMailing/EditMailingCtrl/workflow.html
M ang/crmMailingAB/BlockMailing.html
M api/v3/utils.php
M bin/ContributionProcessor.php
M bin/regen.sh
M bin/setup.conf
M bin/setup.lib.sh
M bower_components/jquery-ui/.bower.json
M civicrm-version.php
M composer.json
M composer.lock
M css/civicrm.css
M css/civicrmNavigation.css
M drupal/civicrm.module
M install/template.html
M js/Common.js
M js/crm.searchForm.js
M settings/Core.setting.php
M settings/Localization.setting.php
M sql/civicrm_data.mysql
M sql/civicrm_generated.mysql
M sql/civicrm_navigation.mysql
M templates/CRM/Activity/Selector/Selector.tpl
M templates/CRM/Admin/Form/Setting/Date.tpl
M templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
M templates/CRM/Campaign/Form/Petition.tpl
M templates/CRM/Contact/Form/Contact.tpl
M templates/CRM/Contact/Form/CustomData.tpl
M templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
M templates/CRM/Contact/Form/Task/SMS.tpl
M templates/CRM/Custom/Form/CustomData.tpl
M templates/CRM/Event/Form/Task/Batch.tpl
M templates/CRM/Member/Form/Membership.tpl
M templates/CRM/Report/Form/Tabs/Instance.tpl
M templates/CRM/Report/Form/Tabs/Settings.hlp
M templates/CRM/Report/Page/InstanceList.tpl
M templates/CRM/common/customData.tpl
M templates/CRM/common/navigation.js.tpl
M vendor/autoload.php
M vendor/composer/ClassLoader.php
A vendor/composer/LICENSE
M vendor/composer/autoload_files.php
M

[MediaWiki-commits] [Gerrit] Implement feed coordinator. - change (apps...wikipedia)

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

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

Change subject: Implement feed coordinator.
..


Implement feed coordinator.

Bug: T137446
Change-Id: I25ebe596605bae07b24c4cc2cd9b2008d985ebda
---
A app/src/main/java/org/wikipedia/feed/FeedClient.java
A app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
A app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
D 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadTopicTask.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
D 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCoordinator.java
M app/src/main/java/org/wikipedia/feed/continuereading/LastPageReadTask.java
A app/src/main/java/org/wikipedia/feed/demo/IntegerListClient.java
M 
app/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/layout/view_feed.xml
D 
app/src/test/java/org/wikipedia/feed/continuereading/ContinueReadingCoordinatorTest.java
14 files changed, 298 insertions(+), 269 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedClient.java 
b/app/src/main/java/org/wikipedia/feed/FeedClient.java
new file mode 100644
index 000..bc850c4
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/FeedClient.java
@@ -0,0 +1,18 @@
+package org.wikipedia.feed;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.feed.model.Card;
+
+import java.util.List;
+
+public interface FeedClient {
+void request(@NonNull Context context, int age, @NonNull final Callback 
cb);
+void cancel();
+
+interface Callback {
+void success(@NonNull List cards);
+void error(@NonNull Throwable caught);
+}
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
new file mode 100644
index 000..40fbd8b
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -0,0 +1,27 @@
+package org.wikipedia.feed;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.becauseyouread.BecauseYouReadClient;
+import org.wikipedia.feed.continuereading.ContinueReadingClient;
+import org.wikipedia.feed.demo.IntegerListClient;
+
+public class FeedCoordinator extends FeedCoordinatorBase {
+
+public FeedCoordinator(@NonNull Context context) {
+super(context);
+}
+
+@Override
+protected void buildScript(Site site) {
+
+// hard-coded list of card types to load when continuing the feed
+addPendingClient(new BecauseYouReadClient(site));
+addPendingClient(new ContinueReadingClient());
+addPendingClient(new IntegerListClient());
+
+}
+
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
new file mode 100644
index 000..59d8055
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -0,0 +1,85 @@
+package org.wikipedia.feed;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.model.Card;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class FeedCoordinatorBase {
+
+public interface FeedUpdateListener {
+void update(List cards);
+}
+
+@NonNull private Context context;
+@Nullable private FeedUpdateListener updateListener;
+@NonNull private final List cards = new ArrayList<>();
+private int currentAge;
+private List pendingClients = new ArrayList<>();
+private FeedClient.Callback exhaustionClientCallback = new 
ExhaustionClientCallback();
+
+public FeedCoordinatorBase(@NonNull Context context) {
+this.context = context;
+}
+
+@NonNull
+public List getCards() {
+return cards;
+}
+
+public void setFeedUpdateListener(@Nullable FeedUpdateListener listener) {
+updateListener = listener;
+}
+
+public void reset() {
+currentAge = 0;
+for (FeedClient client : pendingClients) {
+client.cancel();
+}
+pendingClients.clear();
+cards.clear();
+}
+
+public void more(Site site) {
+if (cards.size() > 0) {
+currentAge++;
+}
+
+buildScript(site);
+requestNextCard();
+}
+
+protected abstract void buildScript(Site site);
+
+protected void

[MediaWiki-commits] [Gerrit] Fix merge hook to remove calculated fields from merge_conflicts - change (wikimedia...crm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Fix merge hook to remove calculated fields from merge_conflicts
..

Fix merge hook to remove calculated fields from merge_conflicts

This means that if 2 contacts have a conflict on is_2006_donor this will not 
block the merge from happening.

Bug: T133625
Change-Id: Ic95edab90a4512cd2d57a96a32dee08db31c33af
---
A sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
3 files changed, 205 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/15/294215/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
new file mode 100644
index 000..c86b0f2
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
@@ -0,0 +1,89 @@
+imitateAdminUser();
+$contact = $this->callAPISuccess('Contact', 'create', array(
+  'contact_type' => 'Individual',
+  'first_name' => 'Donald',
+  'last_name' => 'Duck',
+  'email' => 'the_...@duckland.com',
+  wmf_civicrm_get_custom_field_name('do_not_solicit') => 0,
+));
+$this->contactID = $contact['id'];
+
+$contact = $this->callAPISuccess('Contact', 'create', array(
+  'contact_type' => 'Individual',
+  'first_name' => 'Donald',
+  'last_name' => 'Duck',
+  'email' => 'the_...@duckland.com',
+  wmf_civicrm_get_custom_field_name('do_not_solicit') => 1,
+));
+$this->contactID2 = $contact['id'];
+  }
+
+  public function tearDown() {
+$this->callAPISuccess('Contact', 'delete', array('id' => $this->contactID, 
'skip_undelete' => 1));
+$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contactID2, 'skip_undelete' => 1));
+parent::tearDown();
+  }
+
+  /**
+   * Test that the merge hook causes our custom fields to not be treated as 
conflicts.
+   *
+   * We also need to check the custom data fields afterwards.
+   */
+  public function testMergeHook() {
+$this->callAPISuccess('Contribution', 'create', array(
+  'contact_id' => $this->contactID,
+  'financial_type_id' => 'Cash',
+  'total_amount' => 10,
+  'currencty' => 'USD',
+));
+$this->callAPISuccess('Contribution', 'create', array(
+  'contact_id' => $this->contactID2,
+  'financial_type_id' => 'Cash',
+  'total_amount' => 5,
+  'currencty' => 'USD',
+));
+$contact = $this->callAPISuccess('Contact', 'get', array(
+  'id' => $this->contactID,
+  'sequential' => 1,
+  'return' => 
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'), 
wmf_civicrm_get_custom_field_name('do_not_solicit')),
+));
+$this->assertEquals(10, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
+$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
+  'criteria' => array('contact' => array('IN' => array($this->contactID, 
$this->contactID2))),
+));
+$this->assertEquals(1, $result['values']['merged']);
+$contact = $this->callAPISuccess('Contact', 'get', array(
+  'id' => $this->contactID,
+  'sequential' => 1,
+  'return' => 
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'), 
wmf_civicrm_get_custom_field_name('do_not_solicit')),
+));
+$this->assertEquals(15, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
+$this->assertEquals(1, 
$contact['values'][0][wmf_civicrm_get_custom_field_name('do_not_solicit')]);
+  }
+
+}
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dbb7c87..332ad70 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2030,6 +2030,18 @@
  */
 function wmf_civicrm_civicrm_merge( $type, &$refs, $mainId, $otherId, $tables 
) {
 switch ( $type ) {
+  case 'batch' :
+if (isset($refs['fields_in_conflict'])){
+  $wmfCalculatedFields = wmf_civicrm_get_calculated_fields();
+  foreach ($wmfCalculatedFields as $wmfCalculatedField) {
+$keyString = 'move_' . $wmfCalculatedField;
+if (array_key_exists($keyString, $refs['fields_in_conflict'])) {
+  unset($refs['fields_in_conflict'][$keyString]);
+}
+  }
+}
+break;
+
 case 'cidRefs':
 // adds our custom tables, except for wmf_donor, which is recalculated
 $contact_types = array( "Contact" );
@@ -2058,36 +2070,7 @@
 if ( $tables ) {
 break;
 }
-$refs[] = "INSERT INTO wmf_donor( entity_id, last_donation_date, 
lifetime_usd_total ) (
-SELECT

[MediaWiki-commits] [Gerrit] CiviCRM 4.7.9(ish) - change (wikimedia...crm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: CiviCRM 4.7.9(ish)
..

CiviCRM 4.7.9(ish)

Change-Id: Id480ed1b8498952498c1b95d4178305db8702ab2
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/14/294214/1

diff --git a/civicrm b/civicrm
index 15b2cb2..413861b 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 15b2cb2c419029302c73622197527cc1184831cb
+Subproject commit 413861b6d2110b16b51fd0b321dab4f3775e9637

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id480ed1b8498952498c1b95d4178305db8702ab2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Remove autoload_static as it won't phplint on 5.3 for us. - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Remove autoload_static as it won't phplint on 5.3 for us.
..


Remove autoload_static as it won't phplint on 5.3 for us.

If we upgrade to php 5.6 we will need this back

Change-Id: I5604e4f556007260fcc8776c8eff372f2bc8f650
---
D vendor/composer/autoload_static.php
1 file changed, 0 insertions(+), 352 deletions(-)

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



diff --git a/vendor/composer/autoload_static.php 
b/vendor/composer/autoload_static.php
deleted file mode 100644
index 507dbb3..000
--- a/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,352 +0,0 @@
- __DIR__ . '/..' . 
'/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
-);
-
-public static $prefixLengthsPsr4 = array (
-'P' => 
-array (
-'PhpOffice\\PhpWord\\' => 18,
-),
-'C' => 
-array (
-'Civi\\Cxn\\Rpc\\' => 13,
-),
-);
-
-public static $prefixDirsPsr4 = array (
-'PhpOffice\\PhpWord\\' => 
-array (
-0 => __DIR__ . '/..' . '/phpoffice/phpword/src/PhpWord',
-),
-'Civi\\Cxn\\Rpc\\' => 
-array (
-0 => __DIR__ . '/..' . '/civicrm/civicrm-cxn-rpc/src',
-),
-);
-
-public static $prefixesPsr0 = array (
-'S' => 
-array (
-'System' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Symfony\\Component\\Process\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/process',
-),
-'Symfony\\Component\\Finder\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/finder',
-),
-'Symfony\\Component\\Filesystem\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/filesystem',
-),
-'Symfony\\Component\\EventDispatcher\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
-),
-'Symfony\\Component\\DependencyInjection\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/dependency-injection',
-),
-'Symfony\\Component\\Config\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/config',
-),
-),
-'P' => 
-array (
-'Psr\\Log\\' => 
-array (
-0 => __DIR__ . '/..' . '/psr/log',
-),
-'PHPUnit_' => 
-array (
-0 => __DIR__ . '/../..' . '/packages',
-),
-),
-'N' => 
-array (
-'Net' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'M' => 
-array (
-'Math' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'F' => 
-array (
-'File' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'C' => 
-array (
-'Crypt' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Civi\\' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-1 => __DIR__ . '/../..' . '/tests/phpunit',
-),
-'Civi' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-),
-'CA_Config' => 
-array (
-0 => __DIR__ . '/..' . '/totten/ca-config/src',
-),
-),
-);
-
-public static $classMap = array (
-'Absolute_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/absolute_positioner.cls.php',
-'Abstract_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/abstract_renderer.cls.php',
-'Adobe_Font_Metrics' => __DIR__ . '/..' . 
'/phenx/php-font-lib/classes/Adobe_Font_Metrics.php',
-'Attribute_Translator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/attribute_translator.cls.php',
-'Block_Frame_Decorator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_decorator.cls.php',
-'Block_Frame_Reflower' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_reflower.cls.php',
-'Block_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_positioner.cls.php',
-'Block_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_renderer.cls.php',
-'CPDF_Adapter' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/cpdf_adapter.cls.php',
-'CSS_Color' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/css_color.cls.php',

[MediaWiki-commits] [Gerrit] Knock out a couple of trait files coz php5.3 - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Knock out a couple of trait files coz php5.3
..


Knock out a couple of trait files coz php5.3

Change-Id: I4fe3d1aacaedf3e24ca5c9e99e08a6b3a6102ed7
---
D vendor/psr/log/Psr/Log/LoggerAwareTrait.php
D vendor/psr/log/Psr/Log/LoggerTrait.php
D 
vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
3 files changed, 0 insertions(+), 188 deletions(-)

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



diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php 
b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
deleted file mode 100644
index f087a3d..000
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ /dev/null
@@ -1,22 +0,0 @@
-logger = $logger;
-}
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php 
b/vendor/psr/log/Psr/Log/LoggerTrait.php
deleted file mode 100644
index 5912496..000
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-log(LogLevel::EMERGENCY, $message, $context);
-}
-
-/**
- * Action must be taken immediately.
- *
- * Example: Entire website down, database unavailable, etc. This should
- * trigger the SMS alerts and wake you up.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function alert($message, array $context = array())
-{
-$this->log(LogLevel::ALERT, $message, $context);
-}
-
-/**
- * Critical conditions.
- *
- * Example: Application component unavailable, unexpected exception.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function critical($message, array $context = array())
-{
-$this->log(LogLevel::CRITICAL, $message, $context);
-}
-
-/**
- * Runtime errors that do not require immediate action but should typically
- * be logged and monitored.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function error($message, array $context = array())
-{
-$this->log(LogLevel::ERROR, $message, $context);
-}
-
-/**
- * Exceptional occurrences that are not errors.
- *
- * Example: Use of deprecated APIs, poor use of an API, undesirable things
- * that are not necessarily wrong.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function warning($message, array $context = array())
-{
-$this->log(LogLevel::WARNING, $message, $context);
-}
-
-/**
- * Normal but significant events.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function notice($message, array $context = array())
-{
-$this->log(LogLevel::NOTICE, $message, $context);
-}
-
-/**
- * Interesting events.
- *
- * Example: User logs in, SQL logs.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function info($message, array $context = array())
-{
-$this->log(LogLevel::INFO, $message, $context);
-}
-
-/**
- * Detailed debug information.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function debug($message, array $context = array())
-{
-$this->log(LogLevel::DEBUG, $message, $context);
-}
-
-/**
- * Logs with an arbitrary level.
- *
- * @param mixed $level
- * @param string $message
- * @param array $context
- * @return null
- */
-abstract public function log($level, $message, array $context = array());
-}
diff --git 
a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
 
b/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
deleted file mode 100644
index 57280aa..000
--- 
a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection;
-
-/**
- * ContainerAware trait.
- *
- * @author Fabien Potencier 
- */
-trait ContainerAwareTrait
-{
-/**
- * @var ContainerInterface
- */
-protected $container;
-
-/**
- * Sets the Container associated with this Controller.
- *
- * @param ContainerInterface $container A ContainerInterface instance
- */
-public function setContainer(ContainerInterface $container = null)
-{
-$this->container = $container;
-}
-}

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

[MediaWiki-commits] [Gerrit] WMF patches over latest master. - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: WMF patches over latest master.
..


WMF patches over latest master.

Includes all our not-yet-merged patches

I wanted to push the branches this is compiled from to gerrit but gerrit was 
less keen.

Patches reflect 2  patches in packages:
https://github.com/civicrm/civicrm-packages/compare/master...eileenmcnaughton:4.7.8?expand=1

And 25 patches here: (some of which are still in QA for 4.7.9)
https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:wmf-4.7.8?expand=1

 @eileenmcnaughton  wmf: CRM-17157 allow more than 2 decimal places in 
currency  …  2ca179f
 @eileenmcnaughton  wmf: CRM-10700 use DELETE FROM instead of TRUNCATE  …   
594acf1
 @eileenmcnaughton  wmf: CRM-17158 block empty searches unless deliberate  
…f7c3324
 @eileenmcnaughton  wmf-sunset patch add extra columns to contribution 
recur tab  … ddfaf47
 @eileenmcnaughton  wmf-sunset patch skip process greetings on contact 
create  …012052b
 @adamwight Merge from master :Include custom fields in default 
export  …   9bdd572
 @adamwight Don't create SQL function at runtime  … 
9562633
 eileen Return more rows per query and use unbuffered query to 
manage the memory  … 4bc658b
 eileen Increase time out while doing exports  …
c069fd9
 (QA 4.7.9) eileen  needs review CRM-17154 wmf-gr report actions 
improvement  … c3dc5b3
 @eileenmcnaughton  Deployment file adds: gitreview, settings.location, 
readme, submodules  …   73af99e
 (does not alter deployed) Add script for compiling deployment repo  …  
02bab90
 eileen Hack for running GenCode  … ba5b1ba
 (QA 4.7.9) eileen  CRM-18681 respect api permissions flag on batch merge 
job   8d830e9
 (QA 4.7.9) eileen  Cleanup a couple of unused vars 7534660
 (QA 4.7.9) eileen  Make the changes John suggested last time, so the tests 
don't break E…  …   2b55947
 (QA 4.7.9) eileen  CRM-18685 Batch merge - custom data not treated as a 
conflict - resul…  …   d335217
 (QA 4.7.9) eileen  CRM-18674 fix date merging for view_only custom fields  
7ca2b85
 (QA 4.7.9) eileen  CRM-18761 fix for dodgey date revert
9e2d509
 eileen quick hack to group safety  …   3ec11c3
 (QA 4.7.9) eileen  To be upstreamed - further custom data perms issue  …   
05f6d29
 eileen Fix another slow point  …   97b2340
 (perf - need to fix better upstream) @eileenmcnaughton Revert "add smartGroup 
title in select clause"  …   e576613
 @eileenmcnaughton  eileenmcnaughtonwmf-sunset-patch alter 
exception behaviour  …   84a3a6c

Change-Id: I37c9a5af150e0d4ae91841f50bc24e488fc729c3
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contact/BAO/Query.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/Search.php
M CRM/Core/BAO/PrevNextCache.php
M CRM/Core/Config.php
M CRM/Core/DAO.php
M CRM/Core/Error.php
M CRM/Core/Form.php
M CRM/Core/Menu.php
M CRM/Core/OptionValue.php
M CRM/Core/Session.php
M CRM/Core/TableHierarchy.php
M CRM/Core/TemporaryErrorScope.php
M CRM/Dedupe/BAO/Rule.php
M CRM/Dedupe/BAO/RuleGroup.php
M CRM/Dedupe/Finder.php
M CRM/Dedupe/Merger.php
M CRM/Export/BAO/Export.php
M CRM/Logging/Reverter.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Detail.php
M CRM/Report/Form/Instance.php
M CRM/Utils/Rule.php
M api/v3/Job.php
M packages/DB/common.php
M packages/DB/mysql.php
A settings_location.php
M templates/CRM/Report/Form.tpl
M templates/CRM/Report/Form/Actions.tpl
A templates/CRM/common/tasks.tpl
33 files changed, 303 insertions(+), 124 deletions(-)

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



diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 11ac3d3..1cc0ea1 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -158,11 +158,11 @@
 // CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache"); // Transaction-safe
 if (CRM_Core_Transaction::isActive()) {
   
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, 
function () {
-CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache");
   });
 }
 else {
-  CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+

[MediaWiki-commits] [Gerrit] Update CiviCRM to latest patches from master - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Update CiviCRM to latest patches from master
..


Update CiviCRM to latest patches from master

This commit includes the patches to be included in 4.7.9 (in July 2016) such as 
have already been merged.
Some of them are ones we want - including the merge of 'My reports'. I am going 
to put our customisations
into a follow up commit for clarity.

Change-Id: I23345fba2331a2e4d5ac01fcce65aecd44298858
---
M CRM/ACL/Page/ACL.php
M CRM/ACL/Page/ACLBasic.php
M CRM/Activity/Form/Activity.php
M CRM/Activity/Form/Task/SearchTaskHookSample.php
M CRM/Activity/Page/AJAX.php
M CRM/Admin/Form/LocationType.php
M CRM/Admin/Form/PaymentProcessor.php
M CRM/Admin/Form/PaymentProcessorType.php
M CRM/Admin/Form/Setting/Date.php
M CRM/Admin/Form/Setting/Miscellaneous.php
M CRM/Badge/BAO/Layout.php
M CRM/Campaign/BAO/Survey.php
M CRM/Case/BAO/Case.php
M CRM/Case/Form/Activity.php
M CRM/Case/Form/Task/SearchTaskHookSample.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/Contact/Utils.php
M CRM/Contact/BAO/Query.php
M CRM/Contact/BAO/Relationship.php
M CRM/Contact/Form/Contact.php
M CRM/Contact/Form/Edit/Address.php
M CRM/Contact/Form/Search/Custom/ActivitySearch.php
M CRM/Contact/Form/Task/PDFLetterCommon.php
M CRM/Contact/Form/Task/SMSCommon.php
M CRM/Contact/Import/Parser/Contact.php
M CRM/Contact/Page/AJAX.php
M CRM/Contact/Task.php
M CRM/Contribute/BAO/Contribution.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/CancelSubscription.php
M CRM/Contribute/Form/Contribution/Main.php
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/Dashboard.php
M CRM/Core/BAO/LabelFormat.php
M CRM/Core/BAO/LocationType.php
M CRM/Core/BAO/Navigation.php
M CRM/Core/BAO/PaperSize.php
M CRM/Core/BAO/PdfFormat.php
M CRM/Core/BAO/SchemaHandler.php
M CRM/Core/BAO/Tag.php
M CRM/Core/Config/MagicMerge.php
M CRM/Core/Payment.php
M CRM/Core/Payment/AuthorizeNet.php
M CRM/Core/Payment/Elavon.php
M CRM/Core/SelectValues.php
M CRM/Core/xml/Menu/Admin.xml
M CRM/Custom/Form/CustomDataByType.php
M CRM/Custom/Form/Field.php
M CRM/Custom/Import/Form/DataSource.php
M CRM/Event/BAO/Event.php
M CRM/Event/BAO/Participant.php
M CRM/Event/Form/Participant.php
M CRM/Event/Form/Registration/Confirm.php
M CRM/Event/Form/SelfSvcTransfer.php
M CRM/Event/Form/SelfSvcUpdate.php
M CRM/Event/Form/Task/Batch.php
M CRM/Event/Form/Task/ParticipantStatus.php
M CRM/Event/Form/Task/SearchTaskHookSample.php
M CRM/Export/BAO/Export.php
M CRM/Financial/BAO/ExportFormat/IIF.php
M CRM/Grant/BAO/Grant.php
M CRM/Grant/Form/Task/SearchTaskHookSample.php
M CRM/Import/Form/DataSource.php
M CRM/Mailing/BAO/Mailing.php
M CRM/Mailing/Event/BAO/Queue.php
M CRM/Mailing/Event/BAO/TrackableURLOpen.php
M CRM/Mailing/Event/BAO/Unsubscribe.php
M CRM/Mailing/Form/Component.php
M CRM/Mailing/Form/Subscribe.php
M CRM/Member/BAO/MembershipPayment.php
M CRM/Member/BAO/MembershipStatus.php
M CRM/Member/BAO/Query.php
M CRM/Member/Task.php
M CRM/Price/BAO/LineItem.php
M CRM/Price/BAO/PriceSet.php
M CRM/Report/BAO/ReportInstance.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Recur.php
M CRM/Report/Form/Instance.php
M CRM/Report/Info.php
M CRM/Report/Page/InstanceList.php
A CRM/Utils/PDF/Document.php
M CRM/Utils/ReCAPTCHA.php
M CRM/Utils/Recent.php
M ang/crmMailing.css
M ang/crmMailing/BlockReview.html
M ang/crmMailing/BlockReview.js
M ang/crmMailing/EditMailingCtrl/2step.html
M ang/crmMailing/EditMailingCtrl/wizard.html
M ang/crmMailing/EditMailingCtrl/workflow.html
M ang/crmMailingAB/BlockMailing.html
M api/v3/utils.php
M bin/ContributionProcessor.php
M bin/regen.sh
M bin/setup.conf
M bin/setup.lib.sh
M bower_components/jquery-ui/.bower.json
M civicrm-version.php
M composer.json
M composer.lock
M css/civicrm.css
M css/civicrmNavigation.css
M drupal/civicrm.module
M install/template.html
M js/Common.js
M js/crm.searchForm.js
M settings/Core.setting.php
M settings/Localization.setting.php
M sql/civicrm_data.mysql
M sql/civicrm_generated.mysql
M sql/civicrm_navigation.mysql
M templates/CRM/Activity/Selector/Selector.tpl
M templates/CRM/Admin/Form/Setting/Date.tpl
M templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
M templates/CRM/Campaign/Form/Petition.tpl
M templates/CRM/Contact/Form/Contact.tpl
M templates/CRM/Contact/Form/CustomData.tpl
M templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
M templates/CRM/Contact/Form/Task/SMS.tpl
M templates/CRM/Custom/Form/CustomData.tpl
M templates/CRM/Event/Form/Task/Batch.tpl
M templates/CRM/Member/Form/Membership.tpl
M templates/CRM/Report/Form/Tabs/Instance.tpl
M templates/CRM/Report/Form/Tabs/Settings.hlp
M templates/CRM/Report/Page/InstanceList.tpl
M templates/CRM/common/customData.tpl
M templates/CRM/common/navigation.js.tpl
M vendor/autoload.php
M vendor/composer/ClassLoader.php
A vendor/composer/LICENSE
M vendor/composer/autoload_files.php
M vendor/composer/autoload_psr4.php

[MediaWiki-commits] [Gerrit] CiviCRM 4.7.8 core code - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: CiviCRM 4.7.8 core code
..


CiviCRM 4.7.8 core code

This is the 4.7.8 tarball untouched by human hands

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bb0c8294c210ffaf54818df12ff5da077fbf847
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
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] In Special:Templates, fix the associated category to the tem... - change (mediawiki...SemanticForms)

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

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

Change subject: In Special:Templates, fix the associated category to the 
template
..


In Special:Templates, fix the associated category to the template

Special:Templates searches for the syntax [[(Category|$cat_ns_name):(.*)]], but
$cat_ns_name was wrongly set the translation of Template instead of the
translation of Category in the last rewrite of this part.

Bug: T69020
Change-Id: Iec26e6801fd7012e327b3deaafcc9bcc5561f917
---
M specials/SF_Templates.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/specials/SF_Templates.php b/specials/SF_Templates.php
index 62f8b5f..bc389b8 100644
--- a/specials/SF_Templates.php
+++ b/specials/SF_Templates.php
@@ -72,7 +72,7 @@
global $wgContLang;
 
$templateText = SFUtils::getPageText( $templateTitle );
-   $cat_ns_name = $wgContLang->getNsText( NS_TEMPLATE );
+   $cat_ns_name = $wgContLang->getNsText( NS_CATEGORY );
if ( preg_match_all( 
"/\[\[(Category|$cat_ns_name):([^\]]*)\]\]/", $templateText, $matches ) ) {
// Get the last match - if there's more than one
// category tag, there's a good chance that the last

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec26e6801fd7012e327b3deaafcc9bcc5561f917
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Seb35 
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] Filter out empty data layers (fixup) - change (mediawiki...Kartographer)

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

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

Change subject: Filter out empty data layers (fixup)
..


Filter out empty data layers (fixup)

Bug: T137764
Change-Id: I1babbd29eecf8e4badc79beb742824afa4aafd5f
---
M modules/kartographer.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/kartographer.js b/modules/kartographer.js
index 366599e..da4a055 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -140,7 +140,7 @@
 
getMapGroupData( data.overlays ).done( function ( 
mapData ) {
$.each( data.overlays, function ( index, group 
) {
-   if ( $.isEmptyObject( mapData[ group ] 
) ) {
+   if ( !$.isEmptyObject( mapData[ group ] 
) ) {
map.dataLayers[ group ] = 
mw.kartographer.addDataLayer( map, mapData[ group ] );
} else {
mw.log.warn( 'Layer not found 
or contains no data: "' + group + '"' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1babbd29eecf8e4badc79beb742824afa4aafd5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Filter out empty data layers (fixup) - change (mediawiki...Kartographer)

2016-06-13 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Filter out empty data layers (fixup)
..

Filter out empty data layers (fixup)

Bug: T137764
Change-Id: I1babbd29eecf8e4badc79beb742824afa4aafd5f
---
M modules/kartographer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/kartographer.js b/modules/kartographer.js
index 366599e..da4a055 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -140,7 +140,7 @@
 
getMapGroupData( data.overlays ).done( function ( 
mapData ) {
$.each( data.overlays, function ( index, group 
) {
-   if ( $.isEmptyObject( mapData[ group ] 
) ) {
+   if ( !$.isEmptyObject( mapData[ group ] 
) ) {
map.dataLayers[ group ] = 
mw.kartographer.addDataLayer( map, mapData[ group ] );
} else {
mw.log.warn( 'Layer not found 
or contains no data: "' + group + '"' );

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

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

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

[MediaWiki-commits] [Gerrit] Filter out empty data layers - change (mediawiki...Kartographer)

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

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

Change subject: Filter out empty data layers
..


Filter out empty data layers

Bug: T137764
Change-Id: Idc145024266453826226d8377b96bd4471547aab
---
M modules/kartographer.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/kartographer.js b/modules/kartographer.js
index 0a26004..366599e 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -140,7 +140,7 @@
 
getMapGroupData( data.overlays ).done( function ( 
mapData ) {
$.each( data.overlays, function ( index, group 
) {
-   if ( mapData.hasOwnProperty( group ) && 
mapData[ group ] ) {
+   if ( $.isEmptyObject( mapData[ group ] 
) ) {
map.dataLayers[ group ] = 
mw.kartographer.addDataLayer( map, mapData[ group ] );
} else {
mw.log.warn( 'Layer not found 
or contains no data: "' + group + '"' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc145024266453826226d8377b96bd4471547aab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Filter out empty data layers - change (mediawiki...Kartographer)

2016-06-13 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Filter out empty data layers
..

Filter out empty data layers

Bug: T137764
Change-Id: Idc145024266453826226d8377b96bd4471547aab
---
M modules/kartographer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/kartographer.js b/modules/kartographer.js
index 0a26004..366599e 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -140,7 +140,7 @@
 
getMapGroupData( data.overlays ).done( function ( 
mapData ) {
$.each( data.overlays, function ( index, group 
) {
-   if ( mapData.hasOwnProperty( group ) && 
mapData[ group ] ) {
+   if ( $.isEmptyObject( mapData[ group ] 
) ) {
map.dataLayers[ group ] = 
mw.kartographer.addDataLayer( map, mapData[ group ] );
} else {
mw.log.warn( 'Layer not found 
or contains no data: "' + group + '"' );

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

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

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

[MediaWiki-commits] [Gerrit] Knock out a couple of trait files coz php5.3 - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Knock out a couple of trait files coz php5.3
..

Knock out a couple of trait files coz php5.3

Change-Id: I4fe3d1aacaedf3e24ca5c9e99e08a6b3a6102ed7
---
D vendor/psr/log/Psr/Log/LoggerAwareTrait.php
D vendor/psr/log/Psr/Log/LoggerTrait.php
2 files changed, 0 insertions(+), 153 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/11/294211/1

diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php 
b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
deleted file mode 100644
index f087a3d..000
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ /dev/null
@@ -1,22 +0,0 @@
-logger = $logger;
-}
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php 
b/vendor/psr/log/Psr/Log/LoggerTrait.php
deleted file mode 100644
index 5912496..000
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-log(LogLevel::EMERGENCY, $message, $context);
-}
-
-/**
- * Action must be taken immediately.
- *
- * Example: Entire website down, database unavailable, etc. This should
- * trigger the SMS alerts and wake you up.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function alert($message, array $context = array())
-{
-$this->log(LogLevel::ALERT, $message, $context);
-}
-
-/**
- * Critical conditions.
- *
- * Example: Application component unavailable, unexpected exception.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function critical($message, array $context = array())
-{
-$this->log(LogLevel::CRITICAL, $message, $context);
-}
-
-/**
- * Runtime errors that do not require immediate action but should typically
- * be logged and monitored.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function error($message, array $context = array())
-{
-$this->log(LogLevel::ERROR, $message, $context);
-}
-
-/**
- * Exceptional occurrences that are not errors.
- *
- * Example: Use of deprecated APIs, poor use of an API, undesirable things
- * that are not necessarily wrong.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function warning($message, array $context = array())
-{
-$this->log(LogLevel::WARNING, $message, $context);
-}
-
-/**
- * Normal but significant events.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function notice($message, array $context = array())
-{
-$this->log(LogLevel::NOTICE, $message, $context);
-}
-
-/**
- * Interesting events.
- *
- * Example: User logs in, SQL logs.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function info($message, array $context = array())
-{
-$this->log(LogLevel::INFO, $message, $context);
-}
-
-/**
- * Detailed debug information.
- *
- * @param string $message
- * @param array $context
- * @return null
- */
-public function debug($message, array $context = array())
-{
-$this->log(LogLevel::DEBUG, $message, $context);
-}
-
-/**
- * Logs with an arbitrary level.
- *
- * @param mixed $level
- * @param string $message
- * @param array $context
- * @return null
- */
-abstract public function log($level, $message, array $context = array());
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fe3d1aacaedf3e24ca5c9e99e08a6b3a6102ed7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Remove autoload_static as it won't phplint on 5.3 for us. - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Remove autoload_static as it won't phplint on 5.3 for us.
..

Remove autoload_static as it won't phplint on 5.3 for us.

If we upgrade to php 5.6 we will need this back

Change-Id: I5604e4f556007260fcc8776c8eff372f2bc8f650
---
D vendor/composer/autoload_static.php
1 file changed, 0 insertions(+), 352 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/10/294210/1

diff --git a/vendor/composer/autoload_static.php 
b/vendor/composer/autoload_static.php
deleted file mode 100644
index 507dbb3..000
--- a/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,352 +0,0 @@
- __DIR__ . '/..' . 
'/phpseclib/phpseclib/phpseclib/Crypt/Random.php',
-);
-
-public static $prefixLengthsPsr4 = array (
-'P' => 
-array (
-'PhpOffice\\PhpWord\\' => 18,
-),
-'C' => 
-array (
-'Civi\\Cxn\\Rpc\\' => 13,
-),
-);
-
-public static $prefixDirsPsr4 = array (
-'PhpOffice\\PhpWord\\' => 
-array (
-0 => __DIR__ . '/..' . '/phpoffice/phpword/src/PhpWord',
-),
-'Civi\\Cxn\\Rpc\\' => 
-array (
-0 => __DIR__ . '/..' . '/civicrm/civicrm-cxn-rpc/src',
-),
-);
-
-public static $prefixesPsr0 = array (
-'S' => 
-array (
-'System' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Symfony\\Component\\Process\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/process',
-),
-'Symfony\\Component\\Finder\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/finder',
-),
-'Symfony\\Component\\Filesystem\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/filesystem',
-),
-'Symfony\\Component\\EventDispatcher\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/event-dispatcher',
-),
-'Symfony\\Component\\DependencyInjection\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/dependency-injection',
-),
-'Symfony\\Component\\Config\\' => 
-array (
-0 => __DIR__ . '/..' . '/symfony/config',
-),
-),
-'P' => 
-array (
-'Psr\\Log\\' => 
-array (
-0 => __DIR__ . '/..' . '/psr/log',
-),
-'PHPUnit_' => 
-array (
-0 => __DIR__ . '/../..' . '/packages',
-),
-),
-'N' => 
-array (
-'Net' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'M' => 
-array (
-'Math' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'F' => 
-array (
-'File' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-),
-'C' => 
-array (
-'Crypt' => 
-array (
-0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-),
-'Civi\\' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-1 => __DIR__ . '/../..' . '/tests/phpunit',
-),
-'Civi' => 
-array (
-0 => __DIR__ . '/../..' . '/',
-),
-'CA_Config' => 
-array (
-0 => __DIR__ . '/..' . '/totten/ca-config/src',
-),
-),
-);
-
-public static $classMap = array (
-'Absolute_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/absolute_positioner.cls.php',
-'Abstract_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/abstract_renderer.cls.php',
-'Adobe_Font_Metrics' => __DIR__ . '/..' . 
'/phenx/php-font-lib/classes/Adobe_Font_Metrics.php',
-'Attribute_Translator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/attribute_translator.cls.php',
-'Block_Frame_Decorator' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_decorator.cls.php',
-'Block_Frame_Reflower' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_frame_reflower.cls.php',
-'Block_Positioner' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_positioner.cls.php',
-'Block_Renderer' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/block_renderer.cls.php',
-'CPDF_Adapter' => __DIR__ . '/..' . 
'/dompdf/dompdf/include/cpdf_adapter.cls.php',
-

[MediaWiki-commits] [Gerrit] Move fatal PHP functions checks to initialization - change (mediawiki/core)

2016-06-13 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Move fatal PHP functions checks to initialization
..

Move fatal PHP functions checks to initialization

The installer is far too late of a place to be checking if
a function does or doesn't exist if we require it for operation.
Functions can very easily (T137509) be called prior to ever
getting to the installer check page.

Also, an old installation could've gotten past the checks if
they ran update.php --skip-compat-checks. What a scary setting!

Instead, fail hard, fast and early along with PHP version checks.
All entry points are required to go through this.

While we're here, also remove the check for mbstring.func_overload
since we already would've failed at WebStart.php

Change-Id: Ib9727979af2a4741f3cd952d13a3bb350fad43e4
---
M includes/PHPVersionCheck.php
M includes/installer/Installer.php
M includes/installer/i18n/en.json
3 files changed, 41 insertions(+), 84 deletions(-)


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

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index ab8aada..64a3e45 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -45,6 +45,22 @@
// @codingStandardsIgnoreEnd
wfMissingVendorError( $entryPoint, $mwVersion );
}
+
+   if ( !function_exists( 'mb_substr' ) ) {
+   wfMissingExtension( $entryPoint, $mwVersion, 'mbstring' );
+   }
+   if ( !function_exists( 'utf8_encode' ) ) {
+   wfMissingExtension( $entryPoint, $mwVersion, 'xml' );
+   }
+   if ( !function_exists( 'ctype_digit' ) ) {
+   wfMissingExtension( $entryPoint, $mwVersion, 'ctype' );
+   }
+   if ( !function_exists( 'json_decode' ) ) {
+   wfMissingExtension( $entryPoint, $mwVersion, 'json' );
+   }
+   if ( !function_exists( 'iconv' ) ) {
+   wfMissingExtension( $entryPoint, $mwVersion, 'iconv' );
+   }
 }
 
 /**
@@ -201,3 +217,28 @@
 
wfGenericError( $type, $mwVersion, 'External dependencies', $shortText, 
$longText, $longHtml );
 }
+
+/**
+ * Display an error for a PHP extension not existing.
+ *
+ * @param string $type See wfGenericError
+ * @param string $mwVersion See wfGenericError
+ */
+function wfMissingExtension( $type, $mwVersion, $missingExt ) {
+   $shortText = "Installing some PHP extensions is required.";
+
+   $longText = "Error: You are missing a required component of PHP.\n"
+   . "You are missing a required extension to PHP that\n"
+   . "MediaWiki needs to run. Please install 
'$missingExtension.'\n"
+   . "More details available: 
";
+
+   // @codingStandardsIgnoreStart Generic.Files.LineLength
+   $longHtml = <<$missingExt.
+   More details available https://secure.php.net/$missingExt;>PHP.net.
+HTML;
+   // @codingStandardsIgnoreEnd
+
+   wfGenericError( $type, $mwVersion, 'Required components', $shortText, 
$longText, $longHtml );
+}
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7c161ca..4d5aa7a 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -121,8 +121,6 @@
protected $envChecks = [
'envCheckDB',
'envCheckBrokenXML',
-   'envCheckMbstring',
-   'envCheckXML',
'envCheckPCRE',
'envCheckMemory',
'envCheckCache',
@@ -136,9 +134,6 @@
'envCheckUploadsDirectory',
'envCheckLibicu',
'envCheckSuhosinMaxValueLength',
-   'envCheckCtype',
-   'envCheckIconv',
-   'envCheckJSON',
];
 
/**
@@ -792,40 +787,6 @@
}
 
/**
-* Environment check for mbstring.func_overload.
-* @return bool
-*/
-   protected function envCheckMbstring() {
-   if ( wfIniGetBool( 'mbstring.func_overload' ) ) {
-   $this->showError( 'config-mbstring' );
-
-   return false;
-   }
-
-   if ( !function_exists( 'mb_substr' ) ) {
-   $this->showError( 'config-mbstring-absent' );
-
-   return false;
-   }
-
-   return true;
-   }
-
-   /**
-* Environment check for the XML module.
-* @return bool
-*/
-   protected function envCheckXML() {
-   if ( !function_exists( "utf8_encode" ) ) {
-   $this->showError( 'config-xml-bad' );
-
-   return false;
-   }
-
-   return true;
-   }
-
-   /**
 * Environment check for the PCRE module.
 *

[MediaWiki-commits] [Gerrit] Add script for updating production build - change (wikidata...gui)

2016-06-13 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Add script for updating production build
..

Add script for updating production build

Bug: T137623
Change-Id: I54017960b753aa31eadf137908708b206aef88f4
---
A scripts/gui-update.sh
1 file changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/08/294208/1

diff --git a/scripts/gui-update.sh b/scripts/gui-update.sh
new file mode 100755
index 000..1ed4be1
--- /dev/null
+++ b/scripts/gui-update.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+cd `dirname $0`/..
+git remote update
+git pull
+lastrev=$(git rev-parse HEAD)
+message=$(git log -1 --pretty=%B)
+newmessage=$(cat  .gitreview 

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

[MediaWiki-commits] [Gerrit] Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5: - change (wikidata...gui-deploy)

2016-06-13 Thread Smalyshev (Code Review)

Smalyshev has submitted this change and it was merged.

Change subject: Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5:
..


Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5:

Merge "Use html minification in grunt"

Change-Id: I507890b05ca0606fc0806e121781248d0146354f
---
M index.html
1 file changed, 1 insertion(+), 187 deletions(-)

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



diff --git a/index.html b/index.html
index 5a6331a..f6e154a 100644
--- a/index.html
+++ b/index.html
@@ -1,187 +1 @@
-
-
-
-
-
-   
-   Wikidata Query Service (Beta)
-
-
-
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   Toggle 
navigation   

-   
-   
-   Wikidata Query Service
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   Add Standard Prefixes
-   
-   
-   
-   
-   https://tools.wmflabs.org/hay/propbrowse/;> Hay's 
Properties Browser
-   https://tools.wmflabs.org/sqid/#/browse?type=properties;> SQID 
Properties Browser
-   https://angryloki.github.io/wikidata-graph-builder/;> Wikidata 
Graph Builder
-   
-   https://github.com/wikimedia/wikidata-query-rdf/blob/master/docs/exploring-linked-data.md;> Exploring 
Linked Data
-   https://tools.wmflabs.org/wdq2sparql/w2s.php;> WDQ Syntax 
Translator
-   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual#SPARQL_endpoint;> SPARQL REST 
Endpoint
-   
-   
-   
-   
-   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;>Give
 Feedback!
-   
-   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual;>User 
Manual
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/SPARQL_Query_Examples;>Sample
 Queries
-   
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format;>RDF 
Data Model
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Full_list_of_prefixes;>List
 of prefixes
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-   Press [CTRL-SPACE] to 
activate auto completion. Data last updated: [connecting]
-   
-   
-   
-   
-

[MediaWiki-commits] [Gerrit] Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5: - change (wikidata...gui-deploy)

2016-06-13 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5:
..

Merging from da029d250a7e2bf9f64df9fde451328616e7f0e5:

Merge "Use html minification in grunt"

Change-Id: I507890b05ca0606fc0806e121781248d0146354f
---
M index.html
1 file changed, 1 insertion(+), 187 deletions(-)


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

diff --git a/index.html b/index.html
index 5a6331a..f6e154a 100644
--- a/index.html
+++ b/index.html
@@ -1,187 +1 @@
-
-
-
-
-
-   
-   Wikidata Query Service (Beta)
-
-
-
-   
-   
-
-
-   
-   
-   
-   
-   
-   
-   Toggle 
navigation   

-   
-   
-   Wikidata Query Service
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   Add Standard Prefixes
-   
-   
-   
-   
-   https://tools.wmflabs.org/hay/propbrowse/;> Hay's 
Properties Browser
-   https://tools.wmflabs.org/sqid/#/browse?type=properties;> SQID 
Properties Browser
-   https://angryloki.github.io/wikidata-graph-builder/;> Wikidata 
Graph Builder
-   
-   https://github.com/wikimedia/wikidata-query-rdf/blob/master/docs/exploring-linked-data.md;> Exploring 
Linked Data
-   https://tools.wmflabs.org/wdq2sparql/w2s.php;> WDQ Syntax 
Translator
-   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual#SPARQL_endpoint;> SPARQL REST 
Endpoint
-   
-   
-   
-   
-   https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service=edit=new;>Give
 Feedback!
-   
-   https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual;>User 
Manual
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/SPARQL_Query_Examples;>Sample
 Queries
-   
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format;>RDF 
Data Model
-   https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Full_list_of_prefixes;>List
 of prefixes
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-   
-   Press [CTRL-SPACE] to 
activate auto completion. Data last updated: [connecting]
-   
-   
-   
-

[MediaWiki-commits] [Gerrit] Remove PHPVersionError, deprecated and unused since 1.25 - change (mediawiki/core)

2016-06-13 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Remove PHPVersionError, deprecated and unused since 1.25
..

Remove PHPVersionError, deprecated and unused since 1.25

Change-Id: Id6637886dc1d5ce3a13c9ba23dd23e76b2168eba
---
D includes/PHPVersionError.php
1 file changed, 0 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/294206/1

diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
deleted file mode 100644
index 9fbcf89..000
--- a/includes/PHPVersionError.php
+++ /dev/null
@@ -1,26 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @deprecated 1.25
- * @file
- */
-// @codingStandardsIgnoreStart MediaWiki.Usage.DirUsage.FunctionFound
-require_once dirname( __FILE__ ) . '/PHPVersionCheck.php';
-// @codingStandardsIgnoreEnd

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

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

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

[MediaWiki-commits] [Gerrit] WMF patches over latest master. - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: WMF patches over latest master.
..

WMF patches over latest master.

Includes all our not-yet-merged patches

I wanted to push the branches this is compiled from to gerrit but gerrit was 
less keen.

Patches reflect 2  patches in packages:
https://github.com/civicrm/civicrm-packages/compare/master...eileenmcnaughton:4.7.8?expand=1

And 25 patches here: (some of which are still in QA for 4.7.9)
https://github.com/civicrm/civicrm-core/compare/master...eileenmcnaughton:wmf-4.7.8?expand=1

 @eileenmcnaughton  wmf: CRM-17157 allow more than 2 decimal places in 
currency  …  2ca179f
 @eileenmcnaughton  wmf: CRM-10700 use DELETE FROM instead of TRUNCATE  …   
594acf1
 @eileenmcnaughton  wmf: CRM-17158 block empty searches unless deliberate  
…f7c3324
 @eileenmcnaughton  wmf-sunset patch add extra columns to contribution 
recur tab  … ddfaf47
 @eileenmcnaughton  wmf-sunset patch skip process greetings on contact 
create  …012052b
 @adamwight Merge from master :Include custom fields in default 
export  …   9bdd572
 @adamwight Don't create SQL function at runtime  … 
9562633
 eileen Return more rows per query and use unbuffered query to 
manage the memory  … 4bc658b
 eileen Increase time out while doing exports  …
c069fd9
 (QA 4.7.9) eileen  needs review CRM-17154 wmf-gr report actions 
improvement  … c3dc5b3
 @eileenmcnaughton  Deployment file adds: gitreview, settings.location, 
readme, submodules  …   73af99e
 (does not alter deployed) Add script for compiling deployment repo  …  
02bab90
 eileen Hack for running GenCode  … ba5b1ba
 (QA 4.7.9) eileen  CRM-18681 respect api permissions flag on batch merge 
job   8d830e9
 (QA 4.7.9) eileen  Cleanup a couple of unused vars 7534660
 (QA 4.7.9) eileen  Make the changes John suggested last time, so the tests 
don't break E…  …   2b55947
 (QA 4.7.9) eileen  CRM-18685 Batch merge - custom data not treated as a 
conflict - resul…  …   d335217
 (QA 4.7.9) eileen  CRM-18674 fix date merging for view_only custom fields  
7ca2b85
 (QA 4.7.9) eileen  CRM-18761 fix for dodgey date revert
9e2d509
 eileen quick hack to group safety  …   3ec11c3
 (QA 4.7.9) eileen  To be upstreamed - further custom data perms issue  …   
05f6d29
 eileen Fix another slow point  …   97b2340
 (perf - need to fix better upstream) @eileenmcnaughton Revert "add smartGroup 
title in select clause"  …   e576613
 @eileenmcnaughton  eileenmcnaughtonwmf-sunset-patch alter 
exception behaviour  …   84a3a6c

Change-Id: I37c9a5af150e0d4ae91841f50bc24e488fc729c3
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contact/BAO/Query.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/Search.php
M CRM/Core/BAO/PrevNextCache.php
M CRM/Core/Config.php
M CRM/Core/DAO.php
M CRM/Core/Error.php
M CRM/Core/Form.php
M CRM/Core/Menu.php
M CRM/Core/OptionValue.php
M CRM/Core/Session.php
M CRM/Core/TableHierarchy.php
M CRM/Core/TemporaryErrorScope.php
M CRM/Dedupe/BAO/Rule.php
M CRM/Dedupe/BAO/RuleGroup.php
M CRM/Dedupe/Finder.php
M CRM/Dedupe/Merger.php
M CRM/Export/BAO/Export.php
M CRM/Logging/Reverter.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Detail.php
M CRM/Report/Form/Instance.php
M CRM/Utils/Rule.php
M api/v3/Job.php
M packages/DB/common.php
M packages/DB/mysql.php
A settings_location.php
M templates/CRM/Report/Form.tpl
M templates/CRM/Report/Form/Actions.tpl
A templates/CRM/common/tasks.tpl
33 files changed, 303 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/05/294205/1

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 11ac3d3..1cc0ea1 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -158,11 +158,11 @@
 // CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache"); // Transaction-safe
 if (CRM_Core_Transaction::isActive()) {
   
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, 
function () {
-CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache");
   });
 }
 else {
-

[MediaWiki-commits] [Gerrit] Update CiviCRM to latest patches from master - change (wikimedia...civicrm)

2016-06-13 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Update CiviCRM to latest patches from master
..

Update CiviCRM to latest patches from master

This commit includes the patches to be included in 4.7.9 (in July 2016) such as 
have already been merged.
Some of them are ones we want - including the merge of 'My reports'. I am going 
to put our customisations
into a follow up commit for clarity.

Change-Id: I23345fba2331a2e4d5ac01fcce65aecd44298858
---
M CRM/ACL/Page/ACL.php
M CRM/ACL/Page/ACLBasic.php
M CRM/Activity/Form/Activity.php
M CRM/Activity/Form/Task/SearchTaskHookSample.php
M CRM/Activity/Page/AJAX.php
M CRM/Admin/Form/LocationType.php
M CRM/Admin/Form/PaymentProcessor.php
M CRM/Admin/Form/PaymentProcessorType.php
M CRM/Admin/Form/Setting/Date.php
M CRM/Admin/Form/Setting/Miscellaneous.php
M CRM/Badge/BAO/Layout.php
M CRM/Campaign/BAO/Survey.php
M CRM/Case/BAO/Case.php
M CRM/Case/Form/Activity.php
M CRM/Case/Form/Task/SearchTaskHookSample.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/Contact/Utils.php
M CRM/Contact/BAO/Query.php
M CRM/Contact/BAO/Relationship.php
M CRM/Contact/Form/Contact.php
M CRM/Contact/Form/Edit/Address.php
M CRM/Contact/Form/Search/Custom/ActivitySearch.php
M CRM/Contact/Form/Task/PDFLetterCommon.php
M CRM/Contact/Form/Task/SMSCommon.php
M CRM/Contact/Import/Parser/Contact.php
M CRM/Contact/Page/AJAX.php
M CRM/Contact/Task.php
M CRM/Contribute/BAO/Contribution.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/CancelSubscription.php
M CRM/Contribute/Form/Contribution/Main.php
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/Dashboard.php
M CRM/Core/BAO/LabelFormat.php
M CRM/Core/BAO/LocationType.php
M CRM/Core/BAO/Navigation.php
M CRM/Core/BAO/PaperSize.php
M CRM/Core/BAO/PdfFormat.php
M CRM/Core/BAO/SchemaHandler.php
M CRM/Core/BAO/Tag.php
M CRM/Core/Config/MagicMerge.php
M CRM/Core/Payment.php
M CRM/Core/Payment/AuthorizeNet.php
M CRM/Core/Payment/Elavon.php
M CRM/Core/SelectValues.php
M CRM/Core/xml/Menu/Admin.xml
M CRM/Custom/Form/CustomDataByType.php
M CRM/Custom/Form/Field.php
M CRM/Custom/Import/Form/DataSource.php
M CRM/Event/BAO/Event.php
M CRM/Event/BAO/Participant.php
M CRM/Event/Form/Participant.php
M CRM/Event/Form/Registration/Confirm.php
M CRM/Event/Form/SelfSvcTransfer.php
M CRM/Event/Form/SelfSvcUpdate.php
M CRM/Event/Form/Task/Batch.php
M CRM/Event/Form/Task/ParticipantStatus.php
M CRM/Event/Form/Task/SearchTaskHookSample.php
M CRM/Export/BAO/Export.php
M CRM/Financial/BAO/ExportFormat/IIF.php
M CRM/Grant/BAO/Grant.php
M CRM/Grant/Form/Task/SearchTaskHookSample.php
M CRM/Import/Form/DataSource.php
M CRM/Mailing/BAO/Mailing.php
M CRM/Mailing/Event/BAO/Queue.php
M CRM/Mailing/Event/BAO/TrackableURLOpen.php
M CRM/Mailing/Event/BAO/Unsubscribe.php
M CRM/Mailing/Form/Component.php
M CRM/Mailing/Form/Subscribe.php
M CRM/Member/BAO/MembershipPayment.php
M CRM/Member/BAO/MembershipStatus.php
M CRM/Member/BAO/Query.php
M CRM/Member/Task.php
M CRM/Price/BAO/LineItem.php
M CRM/Price/BAO/PriceSet.php
M CRM/Report/BAO/ReportInstance.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Recur.php
M CRM/Report/Form/Instance.php
M CRM/Report/Info.php
M CRM/Report/Page/InstanceList.php
A CRM/Utils/PDF/Document.php
M CRM/Utils/ReCAPTCHA.php
M CRM/Utils/Recent.php
M ang/crmMailing.css
M ang/crmMailing/BlockReview.html
M ang/crmMailing/BlockReview.js
M ang/crmMailing/EditMailingCtrl/2step.html
M ang/crmMailing/EditMailingCtrl/wizard.html
M ang/crmMailing/EditMailingCtrl/workflow.html
M ang/crmMailingAB/BlockMailing.html
M api/v3/utils.php
M bin/ContributionProcessor.php
M bin/regen.sh
M bin/setup.conf
M bin/setup.lib.sh
M bower_components/jquery-ui/.bower.json
M civicrm-version.php
M composer.json
M composer.lock
M css/civicrm.css
M css/civicrmNavigation.css
M drupal/civicrm.module
M install/template.html
M js/Common.js
M js/crm.searchForm.js
M settings/Core.setting.php
M settings/Localization.setting.php
M sql/civicrm_data.mysql
M sql/civicrm_generated.mysql
M sql/civicrm_navigation.mysql
M templates/CRM/Activity/Selector/Selector.tpl
M templates/CRM/Admin/Form/Setting/Date.tpl
M templates/CRM/Admin/Form/Setting/Miscellaneous.tpl
M templates/CRM/Campaign/Form/Petition.tpl
M templates/CRM/Contact/Form/Contact.tpl
M templates/CRM/Contact/Form/CustomData.tpl
M templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
M templates/CRM/Contact/Form/Task/SMS.tpl
M templates/CRM/Custom/Form/CustomData.tpl
M templates/CRM/Event/Form/Task/Batch.tpl
M templates/CRM/Member/Form/Membership.tpl
M templates/CRM/Report/Form/Tabs/Instance.tpl
M templates/CRM/Report/Form/Tabs/Settings.hlp
M templates/CRM/Report/Page/InstanceList.tpl
M templates/CRM/common/customData.tpl
M templates/CRM/common/navigation.js.tpl
M vendor/autoload.php
M vendor/composer/ClassLoader.php
A vendor/composer/LICENSE
M vendor/composer/autoload_files.php
M

[MediaWiki-commits] [Gerrit] Set gerrit feature branch pointer - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Set gerrit feature branch pointer
..


Set gerrit feature branch pointer

Change-Id: I4c2b54ba43d2edf37d2b399f7e52fcf7fdbfec55
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index ed1aef2..5340f06 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=wikimedia/fundraising/crm/civicrm.git
-defaultbranch=master
+defaultbranch=4.7.8-wmf_dev
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c2b54ba43d2edf37d2b399f7e52fcf7fdbfec55
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] DO NOT MERGE: trip PHPUnit tests - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: DO NOT MERGE: trip PHPUnit tests
..

DO NOT MERGE: trip PHPUnit tests

Change-Id: Ib5c7f62b2614b579f40a2597a452b14cb1855b30
---
A test.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/02/294202/1

diff --git a/test.php b/test.php
new file mode 100644
index 000..d81afb4
--- /dev/null
+++ b/test.php
@@ -0,0 +1,2 @@
+https://gerrit.wikimedia.org/r/294202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5c7f62b2614b579f40a2597a452b14cb1855b30
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: 4.7.8-wmf_dev
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] DO NOT MERGE: trip PHPUnit tests - change (wikimedia...civicrm)

2016-06-13 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: DO NOT MERGE: trip PHPUnit tests
..

DO NOT MERGE: trip PHPUnit tests

Change-Id: Ib5c7f62b2614b579f40a2597a452b14cb1855b30
---
A test.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/01/294201/1

diff --git a/test.php b/test.php
new file mode 100644
index 000..d81afb4
--- /dev/null
+++ b/test.php
@@ -0,0 +1,2 @@
+https://gerrit.wikimedia.org/r/294201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5c7f62b2614b579f40a2597a452b14cb1855b30
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b517e5d..9bd674b - change (mediawiki/extensions)

2016-06-13 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: b517e5d..9bd674b
..


Syncronize VisualEditor: b517e5d..9bd674b

Change-Id: Icc76ba4828922a7a50fa9de7c5cf4150ead8699d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index b517e5d..9bd674b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b517e5dcf1a868fc8e3e8c8826cab37bd829
+Subproject commit 9bd674b0e8e90d2f40997937009a9d07a72abaa0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc76ba4828922a7a50fa9de7c5cf4150ead8699d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (fa99ac7) - change (mediawiki...VisualEditor)

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

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

Change subject: Update VE core submodule to master (fa99ac7)
..


Update VE core submodule to master (fa99ac7)

New changes:
853cb46 Don't fatal when comments are copied

Change-Id: Iac100d64e7cd365576cfa66e0b0f1ef0caf21f11
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index f05419b..fa99ac7 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f05419b41b2e5fbfa7b8642b5d40dd9c6411258f
+Subproject commit fa99ac7009be06b668fa41e00ce43045acba8a27

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac100d64e7cd365576cfa66e0b0f1ef0caf21f11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b517e5d..9bd674b - change (mediawiki/extensions)

2016-06-13 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: b517e5d..9bd674b
..

Syncronize VisualEditor: b517e5d..9bd674b

Change-Id: Icc76ba4828922a7a50fa9de7c5cf4150ead8699d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index b517e5d..9bd674b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b517e5dcf1a868fc8e3e8c8826cab37bd829
+Subproject commit 9bd674b0e8e90d2f40997937009a9d07a72abaa0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc76ba4828922a7a50fa9de7c5cf4150ead8699d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add ORES to whitelisted beta features. - change (operations/mediawiki-config)

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

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

Change subject: Add ORES to whitelisted beta features.
..


Add ORES to whitelisted beta features.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d3243e8..62c0ffe 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12577,6 +12577,7 @@
'cx',   // [Editing] 
2016-11-07 - ContentTranslation
'read-more',// [Reading] 
2016-11-11 - Read more
'cirrussearch-completionsuggester', // [Discovery] 
2016-11-27 - Completion Suggester / type as you search
+   'ores-enabled', // [Research] 
2016-12-12 - ORES
],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eda1ace1b5f81165f5ec5b7dccfb4776d1a6b61
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ladsgroup 
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: Disable diamond labswide (enable for 3 projects) - change (operations/puppet)

2016-06-13 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Disable diamond labswide (enable for 3 projects)
..


labs: Disable diamond labswide (enable for 3 projects)

Bug: T137753
Change-Id: I4ee8419e8e4585fed00a5c5c373d85d1659eadeb
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
A hieradata/labs/ores/common.yaml
M hieradata/labs/tools/common.yaml
4 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 7d618f6..47abafe 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -15,6 +15,10 @@
 # Labs has the memory cgroup controller enabled by default on all jessies
 base::grub::enable_memory_cgroup: true
 
+# Disable diamond collection to graphite temporarily while we get new hardware 
for it
+# See T137753
+diamond::handler: diamond.handler.null.NullHandler
+
 # dns
 labsdnsconfig:
   recursor: 'labs-recursor0.wikimedia.org'
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 4120f7c..3c2df21 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -240,3 +240,6 @@
   eventlogging/analytics:
 repository: eventlogging
 scap_repository: eventlogging/scap/analytics
+
+# Enable diamond collectors for deployment-prep. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file
diff --git a/hieradata/labs/ores/common.yaml b/hieradata/labs/ores/common.yaml
new file mode 100644
index 000..0466dd3
--- /dev/null
+++ b/hieradata/labs/ores/common.yaml
@@ -0,0 +1,2 @@
+# Enable diamond collectors for ores. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file
diff --git a/hieradata/labs/tools/common.yaml b/hieradata/labs/tools/common.yaml
index 3e95f24..ffb8ef8 100644
--- a/hieradata/labs/tools/common.yaml
+++ b/hieradata/labs/tools/common.yaml
@@ -24,3 +24,6 @@
   - tools-elastic-03.tools.eqiad.wmflabs
 
 kubelet::pod_infra_container_image: 
'docker-registry.tools.wmflabs.org/pause:2.0'
+
+# Enable diamond collectors for tools. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ee8419e8e4585fed00a5c5c373d85d1659eadeb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make it possible to disable the upload dialog functionality - change (mediawiki/core)

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

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

Change subject: Make it possible to disable the upload dialog functionality
..


Make it possible to disable the upload dialog functionality

One can disable it by setting `$wgForeignUploadTargets = [];`.

Change-Id: I2489004271078a78a1ce698304fb591196eeb941
---
M RELEASE-NOTES-1.28
M includes/DefaultSettings.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki/mediawiki.ForeignUpload.js
6 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 0e423d2..421def6 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -13,6 +13,9 @@
   is configurable via $wgSessionPbkdf2Iterations.
 * Upload dialog's file upload log comment can now be configured separately for
   local and foreign uploads.
+* $wgForeignUploadTargets now defaults to `[ 'local' ]`, where `'local'`
+  signifies local uploads. A value of `[]` (empty array) now means that
+  no upload targets are allowed, effectively disabling the upload dialog.
 
 === New features in 1.28 ===
 * User::isBot() method for checking if an account is a bot role account.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dc0b60c..0df20f2 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -529,11 +529,12 @@
  * Array of foreign file repo names (set in $wgForeignFileRepos above) that
  * are allowable upload targets. These wikis must have some method of
  * authentication (i.e. CentralAuth), and be CORS-enabled for this wiki.
+ * The string 'local' signifies the default local file repository.
  *
  * Example:
  * $wgForeignUploadTargets = array( 'shared' );
  */
-$wgForeignUploadTargets = [];
+$wgForeignUploadTargets = [ 'local' ];
 
 /**
  * Configuration for file uploads using the embeddable upload dialog
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f808093..2007717 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1514,6 +1514,7 @@
"upload-copy-upload-invalid-domain": "Copy uploads are not available 
from this domain.",
"upload-foreign-cant-upload": "This wiki is not configured to upload 
files to the requested foreign file repository.",
"upload-foreign-cant-load-config": "Loading file upload configuration 
for the foreign file repository failed.",
+   "upload-dialog-disabled": "File uploads using this dialog are disabled 
on this wiki.",
"upload-dialog-title": "Upload file",
"upload-dialog-button-cancel": "Cancel",
"upload-dialog-button-done": "Done",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 8c11752..82f1030 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1695,6 +1695,7 @@
"upload-copy-upload-invalid-domain": "Error message shown if a user is 
trying to upload (i.e. copy) a file from a website that is not in 
$wgCopyUploadsDomains (if set).\n\nSee also:\n* {{msg-mw|http-invalid-url}}\n* 
{{msg-mw|tmp-create-error}}\n* {{msg-mw|tmp-write-error}}",
"upload-foreign-cant-upload": "Error message shown when a user is 
trying to upload a file to foreign repository that is not configured to receive 
file uploads from current wiki.",
"upload-foreign-cant-load-config": "Error message shown when a user is 
trying to upload a file to foreign repository and the foreign wiki is down or 
otherwise unable to respond to API requests.",
+   "upload-dialog-disabled": "Message shown when the upload dialog 
functionality is disabled. (This doesn't mean that uploads in general are 
disabled, only this specific method of uploading.)",
"upload-dialog-title": "Title of the upload dialog 
box\n{{Identical|Upload file}}",
"upload-dialog-button-cancel": "Button to cancel the 
dialog\n{{Identical|Cancel}}",
"upload-dialog-button-done": "Button to close the dialog once upload is 
complete\n{{Identical|Done}}",
diff --git a/resources/Resources.php b/resources/Resources.php
index 106a83b..6004549 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1183,6 +1183,7 @@
],
'messages' => [
'uploaddisabledtext',
+   'upload-dialog-disabled',
'upload-foreign-cant-upload',
]
],
diff --git a/resources/src/mediawiki/mediawiki.ForeignUpload.js 
b/resources/src/mediawiki/mediawiki.ForeignUpload.js
index eeeab68..781c1df 100644
--- a/resources/src/mediawiki/mediawiki.ForeignUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignUpload.js
@@ -43,7 +43,9 @@
// However, if the target is a remote wiki, we must check the 
API
// to confirm that the target is one that this site is

[MediaWiki-commits] [Gerrit] parser: Remove redundant comment about revisionsize cache vary - change (mediawiki/core)

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

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

Change subject: parser: Remove redundant comment about revisionsize cache vary
..


parser: Remove redundant comment about revisionsize cache vary

Follows-up 457431b.

Change-Id: Iac3e4d6c11de3737155e7f7ff35ec7a6a3873865
---
M includes/parser/Parser.php
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index dcc35bd..cbdfec3 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2654,8 +2654,6 @@
$value = $this->getRevisionUser();
break;
case 'revisionsize':
-   # Let the edit saving system know we should 
parse the page
-   # *after* a revision ID has been assigned. This 
is for null edits.
$value = $this->getRevisionSize();
break;
case 'namespace':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac3e4d6c11de3737155e7f7ff35ec7a6a3873865
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix preference namespace list for namespaces specified by na... - change (mediawiki...VisualEditor)

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

Alex Monk has uploaded a new change for review.

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

Change subject: Fix preference namespace list for namespaces specified by name 
instead of index
..

Fix preference namespace list for namespaces specified by name instead of index

Change-Id: I9202066d23eca527571ac817cf3ae64bc2d57bea
---
M VisualEditor.hooks.php
1 file changed, 7 insertions(+), 5 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index fe4368f..9b8f812 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -492,15 +492,17 @@
}
 
/**
-* Convert a namespace index to the local text for display to the user.
+* Convert a namespace to the local text for display to the user.
 *
-* @param $nsIndex int
+* @param $ns int|string
 * @return string
 */
-   private static function convertNs( $nsIndex ) {
+   private static function convertNs( $ns ) {
global $wgLang;
-   if ( $nsIndex ) {
-   return $wgLang->convertNamespace( $nsIndex );
+   if ( is_integer( $ns ) && $ns ) {
+   return $wgLang->convertNamespace( $ns );
+   } else if ( $ns ) {
+   return $wgLang->convertNamespace( 
MWNamespace::getCanonicalIndex( strtolower( $ns ) ) );
} else {
return wfMessage( 'blanknamespace' )->text();
}

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

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

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

[MediaWiki-commits] [Gerrit] parser: Remove redundant comment about revisionsize cache vary - change (mediawiki/core)

2016-06-13 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: parser: Remove redundant comment about revisionsize cache vary
..

parser: Remove redundant comment about revisionsize cache vary

Follows-up 457431b.

Change-Id: Iac3e4d6c11de3737155e7f7ff35ec7a6a3873865
---
M includes/parser/Parser.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/294198/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index dcc35bd..cbdfec3 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2654,8 +2654,6 @@
$value = $this->getRevisionUser();
break;
case 'revisionsize':
-   # Let the edit saving system know we should 
parse the page
-   # *after* a revision ID has been assigned. This 
is for null edits.
$value = $this->getRevisionSize();
break;
case 'namespace':

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

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

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

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

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

Change-Id: I32304920a08ec39e4ad6209f5856a45ee4d20313
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 720a799..c0c1ee2 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 720a799e3c4d3d83694571b63c1f1059afa3d58d
+Subproject commit c0c1ee2fc32c378a0d74badc26453ccf07e5d98d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32304920a08ec39e4ad6209f5856a45ee4d20313
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update cross-wiki upload configuration for I2489004271078a - change (operations/mediawiki-config)

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

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

Change subject: Update cross-wiki upload configuration for I2489004271078a
..


Update cross-wiki upload configuration for I2489004271078a

This is a no-op change. As we plan configuration change for this
feature, we need this before I2489004271078a deployment:
old code is compatible with both old and new config,
but new code is only compatible with new config.

Change-Id: Icefaa6a226b62270bd90b1ea15c6aac7e27eaa11
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dda6493..d3243e8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12487,9 +12487,9 @@
 
 'wgForeignUploadTargets' => [
'default' => [ 'shared' ],
-   'commonswiki' => [],
+   'commonswiki' => [ 'local' ],
'test2wiki' => [ 'testwikirepo' ],
-   'testwiki' => [],
+   'testwiki' => [ 'local' ],
 ],
 
 'wgForeignUploadTestEnabled' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icefaa6a226b62270bd90b1ea15c6aac7e27eaa11
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (fa99ac7) - change (mediawiki...VisualEditor)

2016-06-13 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (fa99ac7)
..

Update VE core submodule to master (fa99ac7)

New changes:
853cb46 Don't fatal when comments are copied

Change-Id: Iac100d64e7cd365576cfa66e0b0f1ef0caf21f11
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index f05419b..fa99ac7 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f05419b41b2e5fbfa7b8642b5d40dd9c6411258f
+Subproject commit fa99ac7009be06b668fa41e00ce43045acba8a27

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

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

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

[MediaWiki-commits] [Gerrit] labs: Disable diamond labswide (enable for 3 projects) - change (operations/puppet)

2016-06-13 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Disable diamond labswide (enable for 3 projects)
..

labs: Disable diamond labswide (enable for 3 projects)

Bug: T137753
Change-Id: I4ee8419e8e4585fed00a5c5c373d85d1659eadeb
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
A hieradata/labs/ores/common.yaml
M hieradata/labs/tools/common.yaml
4 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/294196/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 7d618f6..f626fca 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -15,6 +15,10 @@
 # Labs has the memory cgroup controller enabled by default on all jessies
 base::grub::enable_memory_cgroup: true
 
+# Disable diamond collection to graphite temporarily while we get new hardware 
for it
+# See T137753
+diamond::handler: diamond.handler.NullHandler
+
 # dns
 labsdnsconfig:
   recursor: 'labs-recursor0.wikimedia.org'
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 4120f7c..3c2df21 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -240,3 +240,6 @@
   eventlogging/analytics:
 repository: eventlogging
 scap_repository: eventlogging/scap/analytics
+
+# Enable diamond collectors for deployment-prep. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file
diff --git a/hieradata/labs/ores/common.yaml b/hieradata/labs/ores/common.yaml
new file mode 100644
index 000..0466dd3
--- /dev/null
+++ b/hieradata/labs/ores/common.yaml
@@ -0,0 +1,2 @@
+# Enable diamond collectors for ores. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file
diff --git a/hieradata/labs/tools/common.yaml b/hieradata/labs/tools/common.yaml
index 3e95f24..ffb8ef8 100644
--- a/hieradata/labs/tools/common.yaml
+++ b/hieradata/labs/tools/common.yaml
@@ -24,3 +24,6 @@
   - tools-elastic-03.tools.eqiad.wmflabs
 
 kubelet::pod_infra_container_image: 
'docker-registry.tools.wmflabs.org/pause:2.0'
+
+# Enable diamond collectors for tools. See T137753
+diamond::handler: diamond.handler.graphite.GraphiteHandler
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Add autocomplete hints to personal info form - change (mediawiki...DonationInterface)

2016-06-13 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Add autocomplete hints to personal info form
..


Add autocomplete hints to personal info form

Should let some browsers fill in the whole thing for donors if they want
it to.

Bug: T137716
Change-Id: I47aae5e88576bfb811a5156176323d69488c9639
---
M gateway_forms/mustache/personal_info.html.mustache
M gateway_forms/mustache/state_dropdown.html.mustache
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index 828a899..f20748a 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -1,7 +1,7 @@
 {{# fname_required }}{{! if we don't need the fname, hide the whole name cell 
}}


-   
+   


 {{{ fieldError "fname" }}}
@@ -11,7 +11,7 @@
 {{# street_required }}


-   
+   


 {{{ fieldError "street" }}}
@@ -19,11 +19,11 @@


 {{# city_required }}
-   
+   
 {{/ city_required }}
 {{> state_dropdown }}{{! only renders if required }}
 {{# zip_required }}
-   
+   
 {{/ zip_required }}


@@ -49,7 +49,7 @@
 {{# email_required }}


-   
+   


 {{{ fieldError "email" }}}
diff --git a/gateway_forms/mustache/state_dropdown.html.mustache 
b/gateway_forms/mustache/state_dropdown.html.mustache
index 8b9d547..736310b 100644
--- a/gateway_forms/mustache/state_dropdown.html.mustache
+++ b/gateway_forms/mustache/state_dropdown.html.mustache
@@ -1,5 +1,5 @@
 {{# state_required }}
-   
+   
{{ l10n 
"donate_interface-donor-state" }}
 {{# state_options }}
{{ name }}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47aae5e88576bfb811a5156176323d69488c9639
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Use html minification in grunt - change (wikidata...gui)

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

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

Change subject: Use html minification in grunt
..


Use html minification in grunt

Change-Id: I0fd9a910e3d92362b59eb7ebb5c36d48584c9403
---
M Gruntfile.js
M package.json
2 files changed, 16 insertions(+), 2 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index ae6407d..8cae48e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
+   grunt.loadNpmTasks( 'grunt-contrib-htmlmin' );
 
var pkg = grunt.file.readJSON( 'package.json' );
 
@@ -122,6 +123,17 @@
html: [
'dist/index.html'
]
+   },
+   htmlmin: {
+   dist: {
+   options: {
+   removeComments: true,
+   collapseWhitespace: true
+   },
+   files: {
+   'dist/index.html': 'dist/index.html'
+   }
+   }
}
} );
 
@@ -129,7 +141,8 @@
'jshint', 'jscs', 'jsonlint', 'banana', 'qunit'
] );
grunt.registerTask( 'build', [
-   'clean', 'copy', 'useminPrepare', 'concat', 'cssmin', 
'uglify', 'filerev', 'usemin'
+   'clean', 'copy', 'useminPrepare', 'concat', 'cssmin', 
'uglify', 'filerev', 'usemin',
+   'htmlmin'
] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index a825fdf..dc4561f 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
"grunt-filerev": "",
"grunt-contrib-concat": "",
"grunt-contrib-uglify": "",
-   "grunt-contrib-cssmin": ""
+   "grunt-contrib-cssmin": "",
+   "grunt-contrib-htmlmin": "^1.4.0"
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fd9a910e3d92362b59eb7ebb5c36d48584c9403
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add autocomplete hints to personal info form - change (mediawiki...DonationInterface)

2016-06-13 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Add autocomplete hints to personal info form
..

Add autocomplete hints to personal info form

Should let some browsers fill in the whole thing for donors if they want
it to.

Bug: T137716
Change-Id: I47aae5e88576bfb811a5156176323d69488c9639
---
M gateway_forms/mustache/personal_info.html.mustache
M gateway_forms/mustache/state_dropdown.html.mustache
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index 828a899..f20748a 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -1,7 +1,7 @@
 {{# fname_required }}{{! if we don't need the fname, hide the whole name cell 
}}


-   
+   


 {{{ fieldError "fname" }}}
@@ -11,7 +11,7 @@
 {{# street_required }}


-   
+   


 {{{ fieldError "street" }}}
@@ -19,11 +19,11 @@


 {{# city_required }}
-   
+   
 {{/ city_required }}
 {{> state_dropdown }}{{! only renders if required }}
 {{# zip_required }}
-   
+   
 {{/ zip_required }}


@@ -49,7 +49,7 @@
 {{# email_required }}


-   
+   


 {{{ fieldError "email" }}}
diff --git a/gateway_forms/mustache/state_dropdown.html.mustache 
b/gateway_forms/mustache/state_dropdown.html.mustache
index 8b9d547..736310b 100644
--- a/gateway_forms/mustache/state_dropdown.html.mustache
+++ b/gateway_forms/mustache/state_dropdown.html.mustache
@@ -1,5 +1,5 @@
 {{# state_required }}
-   
+   
{{ l10n 
"donate_interface-donor-state" }}
 {{# state_options }}
{{ name }}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47aae5e88576bfb811a5156176323d69488c9639
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

2016-06-13 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

Change-Id: I32304920a08ec39e4ad6209f5856a45ee4d20313
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/294194/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 720a799..2c2792b 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 720a799e3c4d3d83694571b63c1f1059afa3d58d
+Subproject commit 2c2792b29d82fb4f7bebec960dd42c121a7b1c34

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32304920a08ec39e4ad6209f5856a45ee4d20313
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Default to Adyen in Israel - change (mediawiki...DonationInterface)

2016-06-13 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Default to Adyen in Israel
..


Default to Adyen in Israel

Demoting the existing form name to adyen-test, adding a new adyen
ffname with selection weight 110.  Not going to bother exploding
the forms per country like I did with AstroPay, 'cause hopefully
soon the form chooser will query capabilities.

Bug: T137731
Change-Id: I36014149b05c377335df91a4491ae2bd80efb351
---
M DonationInterfaceFormSettings.php
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index d1e0db7..d47f99b 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -590,12 +590,22 @@
  **/
 $forms_whitelist['adyen'] = array(
'gateway' => 'adyen',
+   'countries' => array( '+' => array( 'IL', ), ),
+   'currencies' => array( '+' => array( 'ILS', ), ),
+   'payment_methods' => array(
+   'cc' => array( 'visa', 'mc', 'amex', 'discover', ),
+   ),
+   'selection_weight' => 110,
+);
+
+$forms_whitelist['adyen-test'] = array(
+   'gateway' => 'adyen',
'countries' => array( '+' => array( 'FR', 'IL', 'JP', 'UA', 'US', ), ),
'currencies' => array( '+' => array( 'EUR', 'ILS', 'JPY', 'UAH', 'USD', 
), ),
'payment_methods' => array(
'cc' => array( 'visa', 'mc', 'amex', 'discover', 'cb', 'jcb', ),
),
-   // Setting form chooser weight to zero till we officially decide to use 
it
+   // Setting form chooser weight to zero so this form is not chosen as 
default
'selection_weight' => 0,
 );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36014149b05c377335df91a4491ae2bd80efb351
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Avoid setting vary-revision for {{REVISIONSIZE}} - change (mediawiki/core)

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

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

Change subject: Avoid setting vary-revision for {{REVISIONSIZE}}
..


Avoid setting vary-revision for {{REVISIONSIZE}}

Just always use the input size for new revisions. If they are
saved, then that should be the revision size. If they are just
null edits, then the size must have matched the current revision.

This also enables edit stashing for this case.

Change-Id: I428c0cc87750eeddd1d7dcebd1a2b03817cec441
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 116b274..dcc35bd 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2656,8 +2656,6 @@
case 'revisionsize':
# Let the edit saving system know we should 
parse the page
# *after* a revision ID has been assigned. This 
is for null edits.
-   $this->mOutput->setFlag( 'vary-revision' );
-   wfDebug( __METHOD__ . ": {{REVISIONSIZE}} used, 
setting vary-revision...\n" );
$value = $this->getRevisionSize();
break;
case 'namespace':
@@ -5637,7 +5635,7 @@
# will change the size.
if ( $revObject ) {
$this->mRevisionSize = $revObject->getSize();
-   } elseif ( $this->ot['wiki'] || 
$this->mOptions->getIsPreview() ) {
+   } else {
$this->mRevisionSize = $this->mInputSize;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I428c0cc87750eeddd1d7dcebd1a2b03817cec441
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Default to Adyen in Israel - change (mediawiki...DonationInterface)

2016-06-13 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Default to Adyen in Israel
..

Default to Adyen in Israel

Demoting the existing form name to adyen-test, adding a new adyen
ffname with selection weight 110.  Not going to bother exploding
the forms per country like I did with AstroPay, 'cause hopefully
soon the form chooser will query capabilities.

Bug: T137731
Change-Id: I36014149b05c377335df91a4491ae2bd80efb351
---
M DonationInterfaceFormSettings.php
1 file changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index d1e0db7..d47f99b 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -590,12 +590,22 @@
  **/
 $forms_whitelist['adyen'] = array(
'gateway' => 'adyen',
+   'countries' => array( '+' => array( 'IL', ), ),
+   'currencies' => array( '+' => array( 'ILS', ), ),
+   'payment_methods' => array(
+   'cc' => array( 'visa', 'mc', 'amex', 'discover', ),
+   ),
+   'selection_weight' => 110,
+);
+
+$forms_whitelist['adyen-test'] = array(
+   'gateway' => 'adyen',
'countries' => array( '+' => array( 'FR', 'IL', 'JP', 'UA', 'US', ), ),
'currencies' => array( '+' => array( 'EUR', 'ILS', 'JPY', 'UAH', 'USD', 
), ),
'payment_methods' => array(
'cc' => array( 'visa', 'mc', 'amex', 'discover', 'cb', 'jcb', ),
),
-   // Setting form chooser weight to zero till we officially decide to use 
it
+   // Setting form chooser weight to zero so this form is not chosen as 
default
'selection_weight' => 0,
 );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36014149b05c377335df91a4491ae2bd80efb351
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

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

1 2 3 4 >

1 - 100 of 350 matches

Mail list logo