[MediaWiki-commits] [Gerrit] Check that a value for global messaging is set before using ... - change (mediawiki...MassMessage)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75066
Change subject: Check that a value for global messaging is set before using
it's value
..
Check that a value for global messaging is set before using it's value
If the user doesn't have the massmessage-global userright, they won't get the
checkbox, so a value is never set for $data['global']. Now it checks that
the value is set and is true.
Change-Id: I88daf6faaab9af32685d6ca9b1cd1f261fd03bb1
---
M SpecialMassMessage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/66/75066/1
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index 09cd7c7..3365ae2 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -135,7 +135,7 @@
function submit( $data ) {
// Check that the spamlist exists.
$spamlist = Title::newFromText( $data['spamlist'] );
- $global = $data['global']; // If the message delivery is global
+ $global = isset( $data['global'] ) && $data['global']; // If
the message delivery is global
$status = new Status();
$errors = array();
if ( $spamlist->getArticleID() == 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/75066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88daf6faaab9af32685d6ca9b1cd1f261fd03bb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround fallout from sysctlfile - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: Workaround fallout from sysctlfile
..
Workaround fallout from sysctlfile
sysctlfile breaks puppet on all 8.04 systems of ours. Apply a very
hackish patch to workaround it for now.
Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
---
M manifests/base.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/base.pp b/manifests/base.pp
index 28706d6..71b4337 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -303,6 +303,7 @@
refreshonly => true;
}
+ # FIXME: *never* source a file from a module
sysctlfile { 'wikimedia-base':
source =>
'puppet:///modules/sysctlfile/50-wikimedia-base.conf',
number_prefix => '50',
@@ -314,6 +315,13 @@
file { "/etc/sysctl.d/10-ipv6-privacy.conf":
ensure => absent
}
+ } else {
+ # FIXME: this is a super ugly hack but the sysctlfile module is
broken,
+ # relying on a definition to be defined in base.pp to actually work
+ exec { "/sbin/start procps":
+ command => '/bin/true',
+ refreshonly => true,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround fallout from sysctlfile - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75065
Change subject: Workaround fallout from sysctlfile
..
Workaround fallout from sysctlfile
sysctlfile breaks puppet on all 8.04 systems of ours. Apply a very
hackish patch to workaround it for now.
Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
---
M manifests/base.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/75065/1
diff --git a/manifests/base.pp b/manifests/base.pp
index 28706d6..71b4337 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -303,6 +303,7 @@
refreshonly => true;
}
+ # FIXME: *never* source a file from a module
sysctlfile { 'wikimedia-base':
source =>
'puppet:///modules/sysctlfile/50-wikimedia-base.conf',
number_prefix => '50',
@@ -314,6 +315,13 @@
file { "/etc/sysctl.d/10-ipv6-privacy.conf":
ensure => absent
}
+ } else {
+ # FIXME: this is a super ugly hack but the sysctlfile module is
broken,
+ # relying on a definition to be defined in base.pp to actually work
+ exec { "/sbin/start procps":
+ command => '/bin/true',
+ refreshonly => true,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6138325dfe9ee11b66fa07ac465da3411067b965
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Title::newFromText will return null if the user provides an ... - change (mediawiki...MassMessage)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75064
Change subject: Title::newFromText will return null if the user provides an
invalid title
..
Title::newFromText will return null if the user provides an invalid title
If a user provides titles like "[[Main Page]]" or "Main Page :>>",
Title::newFromText
will return null. Now it will show the same error message as if the page didn't
exist rather than causing a fatal error.
Change-Id: I6a9c7a2f6023f43cb1563b28f8e67d5262dbf61c
---
M SpecialMassMessage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/64/75064/1
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index 09cd7c7..2c1d115 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -138,7 +138,7 @@
$global = $data['global']; // If the message delivery is global
$status = new Status();
$errors = array();
- if ( $spamlist->getArticleID() == 0 ) {
+ if ( $spamlist === null || $spamlist->getArticleID() == 0 ) {
$status->fatal( 'massmessage-spamlist-doesnotexist' );
}
--
To view, visit https://gerrit.wikimedia.org/r/75064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a9c7a2f6023f43cb1563b28f8e67d5262dbf61c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (power)dns: support multiple listen addresses - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: (power)dns: support multiple listen addresses
..
(power)dns: support multiple listen addresses
Prepare the powerdns configs for multiple IP addresses, in preparation
for switching two of our nameservers to service IPs.
Change-Id: I4e4ce2cd8f25a567a7374b58dbd6f658c02859d0
---
M manifests/dns.pp
M manifests/site.pp
M templates/powerdns/pdns.conf.erb
3 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/dns.pp b/manifests/dns.pp
index b93ab3a..387ed75 100644
--- a/manifests/dns.pp
+++ b/manifests/dns.pp
@@ -38,8 +38,10 @@
}
-class dns::auth-server($ipaddress="", $soa_name="", $master="") {
+class dns::auth-server($ipaddress=[], $soa_name="", $master="") {
$dns_auth_ipaddress = $ipaddress
+ # only used for AXFR and notifies, we don't really care
+ $dns_auth_query_address = $ipaddress[0]
$dns_auth_soa_name = $soa_name
$dns_auth_master = $master
@@ -122,12 +124,12 @@
}
# Publish service ip hostkeys
- @@sshkey {
- "${dns_auth_soa_name}":
+ @@sshkey { $dns_auth_soa_name:
type => ssh-rsa,
key => $sshrsakey,
ensure => present;
- "${dns_auth_ipaddress}":
+ }
+ @@sshkey { $dns_auth_ipaddress:
type => ssh-rsa,
key => $sshrsakey,
ensure => present;
@@ -146,7 +148,7 @@
}
# Monitoring
- monitor_host { $dns_auth_soa_name: ip_address => $dns_auth_ipaddress }
+ monitor_host { $dns_auth_soa_name: ip_address => $dns_auth_ipaddress[0]
}
monitor_service { "auth dns": host => $dns_auth_soa_name, description
=> "Auth DNS", check_command => "check_dns!www.wikipedia.org" }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 3ee41d0..15c0a29 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -791,7 +791,7 @@
dns::recursor::monitor { "208.80.152.131": }
class { "dns::auth-server":
-ipaddress => "208.80.152.130",
+ipaddress => [ "208.80.152.130" ],
soa_name => "ns0.wikimedia.org",
master => $dns_auth_master
}
@@ -1362,7 +1362,7 @@
}
class { "dns::auth-server":
-ipaddress => "208.80.152.142",
+ipaddress => [ "208.80.152.142" ],
soa_name => "ns1.wikimedia.org",
master => $dns_auth_master
}
@@ -2068,7 +2068,7 @@
dns::recursor::statistics
class { "dns::auth-server":
-ipaddress => "91.198.174.4",
+ipaddress => [ "91.198.174.4" ],
soa_name => "ns2.wikimedia.org",
master => $dns_auth_master
}
diff --git a/templates/powerdns/pdns.conf.erb b/templates/powerdns/pdns.conf.erb
index bbd20e7..95177f4 100644
--- a/templates/powerdns/pdns.conf.erb
+++ b/templates/powerdns/pdns.conf.erb
@@ -5,8 +5,8 @@
# Always bind to specific addresses - pdns complains when using INADDR_ANY.
# Change this to the external interface address
-local-address=<%= dns_auth_ipaddress %>
-query-local-address=<%= dns_auth_ipaddress %>
+local-address=<%= dns_auth_ipaddress.join(',') %>
+query-local-address=<%= dns_auth_query_address %>
# Change this to the actual SOA name:
default-soa-name=<%= dns_auth_soa_name %>
--
To view, visit https://gerrit.wikimedia.org/r/74615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e4ce2cd8f25a567a7374b58dbd6f658c02859d0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fill i18n file - change (mediawiki...Annotator)
jenkins-bot has submitted this change and it was merged.
Change subject: Fill i18n file
..
Fill i18n file
Add extension credits
Change-Id: I844acc5d0421bc56be572c6c75a853a2e1ee99be
---
M Annotator.i18n.php
M Annotator.php
2 files changed, 33 insertions(+), 0 deletions(-)
Approvals:
Rjain: Looks good to me, but someone else must approve
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Annotator.i18n.php b/Annotator.i18n.php
index e69de29..a4f3c78 100644
--- a/Annotator.i18n.php
+++ b/Annotator.i18n.php
@@ -0,0 +1,23 @@
+ 'Allows inline comments on pages',
+);
+
+/**
+ * Message documentation
+ * @author Raimond Spekking
+ */
+$messages['qqq'] = array(
+ 'annotator-desc' => '{{desc}}',
+);
\ No newline at end of file
diff --git a/Annotator.php b/Annotator.php
index 6249a55..d06a8b0 100755
--- a/Annotator.php
+++ b/Annotator.php
@@ -3,6 +3,16 @@
*/
+
+$wgExtensionCredits['other'][] = array(
+ 'path' => __FILE__,
+ 'name' => 'Annotator',
+ 'descriptionmsg' => 'annotator-desc',
+ 'version' => '0.1',
+ 'author' => array( 'Richa Jain' ),
+ 'url' => 'https://mediawiki.org/wiki/Extension:Annotator',
+);
+
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['Annotator'] = $dir . 'Annotator.i18n.php';
--
To view, visit https://gerrit.wikimedia.org/r/74830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I844acc5d0421bc56be572c6c75a853a2e1ee99be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Annotator
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: Rjain
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] Fix double-whitespace - change (mediawiki...TranslationNotifications)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix double-whitespace
..
Fix double-whitespace
Spotted by Purodha Blissenbach
http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Translationnotifications-signup-legal/en_(3)
Change-Id: I5a54f3193fc99f7ea6748b2e515f2a263fda894d
---
M TranslationNotifications.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslationNotifications.i18n.php
b/TranslationNotifications.i18n.php
index 18d13c1..1e42c5b 100644
--- a/TranslationNotifications.i18n.php
+++ b/TranslationNotifications.i18n.php
@@ -125,7 +125,7 @@
'translationnotifications-sent-body' => 'Translation notification was
sent.',
'translationnotifications-log-alllanguages' => 'all languages',
'translationnotifications-nodeadline' => 'none',
- 'translationnotifications-signup-legal' => 'You agree that by providing
this information we may contact you regarding topics related to {{SITENAME}} we
think may be of interest to you. You agree your data is subject to our
[[{{MediaWiki:Privacypage}}|privacy policy]].',
+ 'translationnotifications-signup-legal' => 'You agree that by providing
this information we may contact you regarding topics related to {{SITENAME}} we
think may be of interest to you. You agree your data is subject to our
[[{{MediaWiki:Privacypage}}|privacy policy]].',
'translationnotifications-generic-languages' => '',
);
--
To view, visit https://gerrit.wikimedia.org/r/75061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a54f3193fc99f7ea6748b2e515f2a263fda894d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Shirayuki
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] Add linktrail for Malayalam - change (mediawiki/core)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75063
Change subject: Add linktrail for Malayalam
..
Add linktrail for Malayalam
Bug: 44029
Change-Id: I591a92ab563f2ef8340122f63a202d2c02d29d97
---
M languages/messages/MessagesMl.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/75063/1
diff --git a/languages/messages/MessagesMl.php
b/languages/messages/MessagesMl.php
index 95b1f14..3381c6a 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -336,6 +336,8 @@
'pagesincategory_files' => array( '0', 'പ്രമാണങ്ങൾ', 'files' ),
);
+$linkTrail = "/^([a-z\x{0D02}-\x{0D7F}]+)(.*)$/sDu";
+
$digitGroupingPattern = "##,##,###";
$messages = array(
--
To view, visit https://gerrit.wikimedia.org/r/75063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I591a92ab563f2ef8340122f63a202d2c02d29d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Replace "X-query" by "XQuery" - change (mediawiki...MathSearch)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/75062 Change subject: Replace "X-query" by "XQuery" .. Replace "X-query" by "XQuery" Spotted by Siebrand and Shirayuki * http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Xquerygenerator/en_(2) * http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Xquerygenerator/en Change-Id: If365b8c215235f63979af67c30f4648f5b4b3d27 --- M MathSearch.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch refs/changes/62/75062/1 diff --git a/MathSearch.i18n.php b/MathSearch.i18n.php index 616b175..56ed7eb 100644 --- a/MathSearch.i18n.php +++ b/MathSearch.i18n.php @@ -16,7 +16,7 @@ 'specialpages-group-mathsearch' => 'Math search', 'mathsearch-desc' => 'Integrates the [http://search.mathweb.org/about.html MathWeb Search] engine', 'getequationsbyquery' => 'Get equations by query', // Special page - 'xquerygenerator' => 'X-query generator', // Special page + 'xquerygenerator' => 'XQuery generator', // Special page 'mathdebug' => 'Test Renderer', // Special page 'mathmode_0' => 'MW_MATH_PNG', 'mathmode_1' => 'MW_MATH_SIMPLE', -- To view, visit https://gerrit.wikimedia.org/r/75062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If365b8c215235f63979af67c30f4648f5b4b3d27 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up: Consistently use "$" instead of "$( document ).ready" - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up: Consistently use "$" instead of "$( document ).ready"
..
Clean up: Consistently use "$" instead of "$( document ).ready"
Change-Id: Ie370fec8c851607f5ea7401e92129f9f60b6268b
---
M includes/installer/WebInstallerPage.php
M resources/mediawiki.action/mediawiki.action.edit.editWarning.js
M resources/mediawiki.action/mediawiki.action.edit.js
M resources/mediawiki.action/mediawiki.action.edit.preview.js
M resources/mediawiki.action/mediawiki.action.history.js
M resources/mediawiki.page/mediawiki.page.patrol.ajax.js
M resources/mediawiki.page/mediawiki.page.startup.js
M resources/mediawiki.page/mediawiki.page.watch.ajax.js
M resources/mediawiki.special/mediawiki.special.block.js
M resources/mediawiki.special/mediawiki.special.changeemail.js
M resources/mediawiki.special/mediawiki.special.createAccount.js
M resources/mediawiki.special/mediawiki.special.movePage.js
M resources/mediawiki.special/mediawiki.special.preferences.js
M resources/mediawiki.special/mediawiki.special.recentchanges.js
M resources/mediawiki.special/mediawiki.special.search.js
M resources/mediawiki.special/mediawiki.special.undelete.js
M resources/mediawiki.special/mediawiki.special.upload.js
M resources/mediawiki/mediawiki.htmlform.js
M resources/mediawiki/mediawiki.searchSuggest.js
M skins/common/config.js
M skins/common/upload.js
21 files changed, 27 insertions(+), 27 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
JGonera: Looks good to me, but someone else must approve
jenkins-bot: Verified
Objections:
Yuvipanda: There's a problem with this change, please improve
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 8a9fc2d..6ac1912 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1254,8 +1254,8 @@
$lsUrl = $this->getVar( 'wgServer' ) . $this->parent->getURL(
array( 'localsettings' => 1 ) );
if ( isset( $_SERVER['HTTP_USER_AGENT'] ) &&
strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !==
false ) {
- // JS appears the only method that works consistently
with IE7+
- $this->addHtml( "\njQuery( document ).ready(
function () { document.location = " .
+ // JS appears to be the only method that works
consistently with IE7+
+ $this->addHtml( "\n