[MediaWiki-commits] [Gerrit] bug fix, handle partial buffers that don't start with open p... - change (operations/dumps)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54330
Change subject: bug fix, handle partial buffers that don't start with open
parenthesis
..
bug fix, handle partial buffers that don't start with open parenthesis
account for case where input buffer ends with closing paren of tuple
and next buffer read will get possible spaces and the separator (comma)
Change-Id: I2d2ca426e1c12f78812c7eccbc09f43294726b2b
---
M xmlfileutils/sql2txt.c
1 file changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/30/54330/1
diff --git a/xmlfileutils/sql2txt.c b/xmlfileutils/sql2txt.c
index 3d64a82..efb9ded 100644
--- a/xmlfileutils/sql2txt.c
+++ b/xmlfileutils/sql2txt.c
@@ -225,8 +225,20 @@
if (!start) skip++;
else start+=7;
}
- else if (sql-in_buf-content[0] != '(') skip++;
- else start = sql-in_buf-content;
+ else {
+start = sql-in_buf-content;
+/*
+ allow leading blanks, a separator, trailing blanks, because we
+ may be reading from the end of a previous tuple in the middle of a line
+ this means someone could sneak in an extra separator or even start a
+ line with one, stricly speaking that's garbage syntax, but let 'em
+ do it as long as the tuples are good, who cares
+ */
+while (*start == ' ') start++;
+if (*start == ',') start++;
+while (*start == ' ') start++;
+if (*start != '(') skip++;
+ }
if (skip) return(0); /* don't process this line, it doesn't have a data
tuple */
buf[0] = '\n';
--
To view, visit https://gerrit.wikimedia.org/r/54330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d2ca426e1c12f78812c7eccbc09f43294726b2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor formatGettextComments - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Refactor formatGettextComments
..
Refactor formatGettextComments
Make these visible in the editor but not editable
Change-Id: I7fdb92faee54099e451022fd879e77d36b53b646
---
M _autoload.php
M resources/js/ext.translate.editor.helpers.js
M resources/js/ext.translate.editor.js
M translationaids/DocumentationAid.php
A translationaids/GettextDocumentationAid.php
M translationaids/TranslationAid.php
6 files changed, 100 insertions(+), 50 deletions(-)
Approvals:
Amire80: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/_autoload.php b/_autoload.php
index b8be167..a9d5b96 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -261,6 +261,7 @@
*/
$wgAutoloadClasses['CurrentTranslationAid'] =
$dir/translationaids/CurrentTranslationAid.php;
$wgAutoloadClasses['DocumentationAid'] =
$dir/translationaids/DocumentationAid.php;
+$wgAutoloadClasses['GettextDocumentationAid'] =
$dir/translationaids/GettextDocumentationAid.php;
$wgAutoloadClasses['InOtherLanguagesAid'] =
$dir/translationaids/InOtherLanguagesAid.php;
$wgAutoloadClasses['MachineTranslationAid'] =
$dir/translationaids/MachineTranslationAid.php;
$wgAutoloadClasses['MessageDefinitionAid'] =
$dir/translationaids/MessageDefinitionAid.php;
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index 828553d..bee68db 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -176,6 +176,29 @@
},
/**
+* Shows uneditable documentation.
+* @param {Object} documentation A gettext object as returned
by API.
+*/
+ showUneditableDocumentation: function ( documentation ) {
+ var dir;
+
+ if ( documentation.error ) {
+ return;
+ }
+
+ dir = $.uls.data.getDir( documentation.language );
+
+ this.$editor.find( '.uneditable-documentation' )
+ .attr( {
+ lang: documentation.language,
+ dir: dir
+ } )
+ .addClass( 'mw-content-' + dir )
+ .html( documentation.html )
+ .removeClass( 'hide' );
+ },
+
+ /**
* Shows the translations from other languages
* @param {array} translations An inotherlanguages array as
returned by the translation helpers API.
*/
@@ -410,6 +433,7 @@
}
translateEditor.showMessageDocumentation(
result.helpers.documentation );
+ translateEditor.showUneditableDocumentation(
result.helpers.gettext );
translateEditor.showAssistantLanguages(
result.helpers.inotherlanguages );
translateEditor.showTranslationMemory(
result.helpers.ttmserver );
translateEditor.showMachineTranslations(
result.helpers.mt );
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index f82300c..e9515e9 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -615,6 +615,10 @@
}
$infoColumn.append( $( 'div' )
+ .addClass( 'row uneditable-documentation hide' )
+ );
+
+ $infoColumn.append( $( 'div' )
.addClass( 'row tm-suggestions-title hide' )
.text( mw.msg( 'tux-editor-suggestions-title' )
)
);
diff --git a/translationaids/DocumentationAid.php
b/translationaids/DocumentationAid.php
index f6c0f92..6406cba 100644
--- a/translationaids/DocumentationAid.php
+++ b/translationaids/DocumentationAid.php
@@ -26,60 +26,10 @@
$info = TranslateUtils::getMessageContent( $page,
$wgTranslateDocumentationLanguageCode, $ns );
- $gettext = $this-formatGettextComments();
- if ( $info !== null $gettext ) {
- $info .= Html::element( 'hr' );
- }
- $info .= $gettext;
-
return array(
'language' = $wgContLang-getCode(),
'value' = $info,
'html' = $this-context-getOutput()-parse( $info ),
);
}
-
- protected function formatGettextComments() {
- // We
[MediaWiki-commits] [Gerrit] (Bug 45433) Adjust floating/sticking headers/footers when fi... - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 45433) Adjust floating/sticking headers/footers when
filtering
..
(Bug 45433) Adjust floating/sticking headers/footers when filtering
Change-Id: I2a2f797d51e755ea302a9f586f80ebe41d5d8108
---
M resources/js/ext.translate.messagetable.js
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 47c6f0d..1e3e545 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -319,6 +319,10 @@
}
this.$loader.trigger( 'appear' );
+
+ // Trigger a scroll event for the window to make sure
all floating toolbars
+ // are in their position.
+ $( window ).trigger( 'scroll' );
},
resize: function () {
--
To view, visit https://gerrit.wikimedia.org/r/53143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a2f797d51e755ea302a9f586f80ebe41d5d8108
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Checking for different types of workflow states absence - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54331
Change subject: Checking for different types of workflow states absence
..
Checking for different types of workflow states absence
Change-Id: If071ea0fefb9c8be5a6f47ec0877bc59afd2dffd
---
M resources/js/ext.translate.special.translate.js
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/31/54331/1
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 6aad5e5..04a8068 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -152,7 +152,10 @@
var $workflowStateSelector,
$workflowStatusTrigger = $(
'.tux-workflow-status' );
- if ( !group.workflowstates ) {
+ if ( !group.workflowstates ||
+ $.isArray( group.workflowstates )
!group.workflowstates.length ||
+ $.isEmptyObject( group.workflowstates )
+ ) {
$workflowStatusTrigger.addClass( 'hide' );
return;
--
To view, visit https://gerrit.wikimedia.org/r/54331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If071ea0fefb9c8be5a6f47ec0877bc59afd2dffd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Tuladha Jejeg font for Javanese - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Tuladha Jejeg font for Javanese
..
Add Tuladha Jejeg font for Javanese
for jv as non default font, for jv-java as default font
Change-Id: I86a60a510f2d2b070a4aaa7549c1e0c6936a4a01
---
A data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.eot
A data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.ttf
A data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.woff
A data/fontrepo/fonts/TuladhaJejeg/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.eot
b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.eot
new file mode 100644
index 000..33d11ba
--- /dev/null
+++ b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.eot
Binary files differ
diff --git a/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.ttf
b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.ttf
new file mode 100644
index 000..3246f64
--- /dev/null
+++ b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.woff
b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.woff
new file mode 100644
index 000..caf9620
--- /dev/null
+++ b/data/fontrepo/fonts/TuladhaJejeg/TuladhaJejeg_gr.woff
Binary files differ
diff --git a/data/fontrepo/fonts/TuladhaJejeg/font.ini
b/data/fontrepo/fonts/TuladhaJejeg/font.ini
new file mode 100644
index 000..6eca58a
--- /dev/null
+++ b/data/fontrepo/fonts/TuladhaJejeg/font.ini
@@ -0,0 +1,6 @@
+[Tuladha Jejeg]
+languages=jv,jv-java*
+version=1.92
+license=OFL 1.1
+licensefile=OFL.txt
+url=https://sites.google.com/site/jawaunicode/
diff --git a/resources/js/ext.uls.webfonts.repository.js
b/resources/js/ext.uls.webfonts.repository.js
index 0c08b46..c23fe1f 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
// Please do not edit. This file is generated from data/fontrepo by
data/fontrepo/scripts/compile.php
( function ( $ ) {
$.webfonts = $.webfonts || {};
- $.webfonts.repository =
{base:..\/data\/fontrepo\/fonts\/,languages:{af:[system,OpenDyslexic],ahr:[Lohit
Marathi],akk:[Akkadian],am:[AbyssinicaSIL],ar:[Amiri],arb:[Amiri],as:[system,Lohit
Assamese],bh:[Lohit Devanagari],bho:[Lohit
Devanagari],bk:[system,OpenDyslexic],bn:[Siyam Rupali,Lohit
Bengali],bo:[Jomolhari],bpy:[Siyam Rupali,Lohit
Bengali],bug:[Saweri],ca:[system,OpenDyslexic],cdo:[CharisSIL],cy:[system,OpenDyslexic],da:[system,OpenDyslexic],de:[system,OpenDyslexic],dz:[Jomolhari],en:[system,OpenDyslexic],es:[system,OpenDyslexic],et:[system,OpenDyslexic],fa:[Iranian
Sans,Amiri],fi:[system,OpenDyslexic],fo:[system,OpenDyslexic],fr:[system,OpenDyslexic],fy:[system,OpenDyslexic],ga:[system,OpenDyslexic],gd:[system,OpenDyslexic],gl:[system,OpenDyslexic],gom:[Lohit
Devanagari],gu:[Lohit Gujarati],hbo:[Taamey Frank
CLM],he:[system,Miriam CLM,Taamey Frank CLM],hi:[Lohit
Devanagari],hu:[system,OpenDyslexic],id:[system,OpenDyslexic],is:[system,OpenDyslexic],it:[system,OpenDyslexic],km:[KhmerOSbattambang,KhmerOS,KhmerOSbokor,KhmerOSfasthand,KhmerOSfreehand,KhmerOSmuol,KhmerOSmuollight,KhmerOSmuolpali,KhmerOSsiemreap],kn:[Lohit
Kannada,Gubbi],kok:[Lohit
Devanagari],lb:[system,OpenDyslexic],li:[system,OpenDyslexic],mai:[Lohit
Devanagari],mak:[Saweri],mi:[system,OpenDyslexic],ml:[Meera,AnjaliOldLipi],mr:[Lohit
Marathi],ms:[system,OpenDyslexic],my:[TharLon,Myanmar3,Padauk],nb:[system,OpenDyslexic],ne:[Lohit
Nepali,Madan],nl:[system,OpenDyslexic],oc:[system,OpenDyslexic],or:[Lohit
Oriya,Utkal],pa:[Lohit
Punjabi,Saab],pt:[system,OpenDyslexic],sa:[Lohit
Devanagari],saz:[Pagul],sq:[system,OpenDyslexic],sux:[Akkadian],sv:[system,OpenDyslexic],sw:[system,OpenDyslexic],ta:[Lohit
Tamil,Lohit Tamil Classical,Thendral,Thenee],tcy:[Lohit
Kannada,Gubbi],te:[Lohit
Telugu],ti:[AbyssinicaSIL],tl:[system,OpenDyslexic],tr:[system,OpenDyslexic],wa:[system,OpenDyslexic]},fonts:{AbyssinicaSIL:{version:1.200,license:OFL
1.1,eot:AbyssinicaSIL\/AbyssinicaSIL-R.eot,ttf:AbyssinicaSIL\/AbyssinicaSIL-R.ttf,woff:AbyssinicaSIL\/AbyssinicaSIL-R.woff},Akkadian:{version:2.56,license:null,eot:Akkadian\/Akkadian.eot,ttf:Akkadian\/Akkadian.ttf,woff:Akkadian\/Akkadian.woff},Amiri:{version:1.0.2,license:OFL
1.1,ttf:amiri\/amiri-regular.ttf,eot:amiri\/amiri-regular.eot,woff:amiri\/amiri-regular.woff,variants:{bold:Amiri
Bold,bolditalic:Amiri Bold Italic,italic:Amiri Italic}},Amiri
Bold:{version:1.0.2,license:OFL
1.1,fontweight:bold,ttf:amiri\/amiri-bold.ttf,eot:amiri\/amiri-bold.eot,woff:amiri\/amiri-bold.woff},Amiri
Bold Italic:{version:1.0.2,license:OFL
[MediaWiki-commits] [Gerrit] Only record skipped fuzzy and untranslated as hard - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Only record skipped fuzzy and untranslated as hard
..
Only record skipped fuzzy and untranslated as hard
Change-Id: Ia558bfa2c02edf0df26b16b05dd5b0c38dac3043
---
M resources/js/ext.translate.editor.js
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index f82300c..ca551d4 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -157,15 +157,16 @@
* Record it to mark as hard.
*/
skip: function () {
- var translateEditor = this,
- api = new mw.Api();
-
- api.post( {
- action: 'hardmessages',
- title: translateEditor.message.title,
- token: mw.user.tokens.get( 'editToken' )
- } );
- // We don't care about the result of the above ajax call
+ // Only record skips of fuzzy or untranslated as hards
+ // @TODO devise better algorithm
+ if ( this.$messageItem.is( '.fuzzy, .untranslated' ) ) {
+ // We can just ignore the result even if it
fails
+ new mw.Api().post( {
+ action: 'hardmessages',
+ title: this.message.title,
+ token: mw.user.tokens.get( 'editToken' )
+ } );
+ }
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/54209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia558bfa2c02edf0df26b16b05dd5b0c38dac3043
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SolrTTMServer: corner case tweaks - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54334
Change subject: SolrTTMServer: corner case tweaks
..
SolrTTMServer: corner case tweaks
Wrap whole query into try-catch, because if the request times
out, exception can be thrown when iterating the results, not
only when executing the query. Also impose a random max limit
on the query string length for now.
Bug: 43778
Change-Id: I10ad6aded1dcab68f453767c08ba1dd77e2302d9
---
M ttmserver/SolrTTMServer.php
1 file changed, 19 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/34/54334/1
diff --git a/ttmserver/SolrTTMServer.php b/ttmserver/SolrTTMServer.php
index 972a0d4..8fe26a5 100644
--- a/ttmserver/SolrTTMServer.php
+++ b/ttmserver/SolrTTMServer.php
@@ -38,11 +38,27 @@
}
public function query( $sourceLanguage, $targetLanguage, $text ) {
+ try {
+ return $this-doQuery( $sourceLanguage,
$targetLanguage, $text );
+ } catch ( Solarium_Exception $e ) {
+ throw new TranslationHelperException( 'Solarium
exception: ' . $e );
+ }
+ }
+
+ /// @see ReadableTTMServer::query
+ protected function doQuery( $sourceLanguage, $targetLanguage, $text ) {
/* Two query system:
* 1) Find all strings in source language that match text
* 2) Do another query for translations for those strings
*/
wfProfileIn( __METHOD__ );
+ // For now impose a length limit on query string to avoid doing
+ // very slow queries. Magic number.
+ if ( strlen( $text ) 789 ) {
+ return array();
+ }
+
+
$query = $this-client-createSelect();
$query-setFields( array( 'globalid', 'content', 'score' ) );
@@ -70,12 +86,8 @@
$query-createFilterQuery( 'lang' )
-setQuery( 'language:%P1%', array( $sourceLanguage ) );
- // Converting Solarium exceptions to our exceptions
- try {
- $resultset = $this-client-select( $query );
- } catch ( Solarium_Exception $e ) {
- throw new TranslationHelperException( 'Solarium
exception: ' . $e );
- }
+
+ $resultset = $this-client-select( $query );
/* This query is doing two unrelated things:
* 1) Collect the message contents and scores so that they can
@@ -105,11 +117,7 @@
// With AND we would not find anything, obviously.
$fetchQuery-setQueryDefaultOperator(
Solarium_Query_Select::QUERY_OPERATOR_OR );
- try {
- $translations = $this-client-select( $fetchQuery );
- } catch ( Solarium_Exception $e ) {
- throw new TranslationHelperException( 'Solarium
exception: ' . $e );
- }
+ $translations = $this-client-select( $fetchQuery );
$suggestions = array();
foreach ( $translations as $doc ) {
--
To view, visit https://gerrit.wikimedia.org/r/54334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10ad6aded1dcab68f453767c08ba1dd77e2302d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bug fix, handle partial buffers that don't start with open p... - change (operations/dumps)
ArielGlenn has submitted this change and it was merged.
Change subject: bug fix, handle partial buffers that don't start with open
parenthesis
..
bug fix, handle partial buffers that don't start with open parenthesis
account for case where input buffer ends with closing paren of tuple
and next buffer read will get possible spaces and the separator (comma)
Change-Id: I2d2ca426e1c12f78812c7eccbc09f43294726b2b
---
M xmlfileutils/sql2txt.c
1 file changed, 14 insertions(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmlfileutils/sql2txt.c b/xmlfileutils/sql2txt.c
index 3d64a82..efb9ded 100644
--- a/xmlfileutils/sql2txt.c
+++ b/xmlfileutils/sql2txt.c
@@ -225,8 +225,20 @@
if (!start) skip++;
else start+=7;
}
- else if (sql-in_buf-content[0] != '(') skip++;
- else start = sql-in_buf-content;
+ else {
+start = sql-in_buf-content;
+/*
+ allow leading blanks, a separator, trailing blanks, because we
+ may be reading from the end of a previous tuple in the middle of a line
+ this means someone could sneak in an extra separator or even start a
+ line with one, stricly speaking that's garbage syntax, but let 'em
+ do it as long as the tuples are good, who cares
+ */
+while (*start == ' ') start++;
+if (*start == ',') start++;
+while (*start == ' ') start++;
+if (*start != '(') skip++;
+ }
if (skip) return(0); /* don't process this line, it doesn't have a data
tuple */
buf[0] = '\n';
--
To view, visit https://gerrit.wikimedia.org/r/54330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d2ca426e1c12f78812c7eccbc09f43294726b2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some bandage to avoid fatal errors in non-TUX - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54335
Change subject: Some bandage to avoid fatal errors in non-TUX
..
Some bandage to avoid fatal errors in non-TUX
Bug: 44137
Change-Id: If4f11abcf4c571b43be901b801321e7a032a4b63
---
M utils/TranslationEditPage.php
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/35/54335/1
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index ff52e9a..8a3b029 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
@@ -86,7 +86,14 @@
return;
}
- $translation = $helpers-getTranslation();
+ $handle = new MessageHandle( $this-getTitle() );
+ $groupId = MessageIndex::getPrimaryGroupId( $handle );
+
+ $translatio = '';
+ if ( $groupId ) {
+ $translation = $helpers-getTranslation();
+ }
+
$targetLang = Language::factory( $helpers-getTargetLanguage()
);
$textareaParams = array(
'name' = 'text',
@@ -98,7 +105,7 @@
'dir' = $targetLang-getDir(),
);
- if ( !$wgUser-isAllowed( 'translate' ) ) {
+ if ( $groupId || !$wgUser-isAllowed( 'translate' ) ) {
$textareaParams['readonly'] = 'readonly';
}
--
To view, visit https://gerrit.wikimedia.org/r/54335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4f11abcf4c571b43be901b801321e7a032a4b63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SolrTTMServer: corner case tweaks - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: SolrTTMServer: corner case tweaks
..
SolrTTMServer: corner case tweaks
Wrap whole query into try-catch, because if the request times
out, exception can be thrown when iterating the results, not
only when executing the query. Also impose a random max limit
on the query string length for now.
Bug: 43778
Change-Id: I10ad6aded1dcab68f453767c08ba1dd77e2302d9
---
M ttmserver/SolrTTMServer.php
1 file changed, 19 insertions(+), 11 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ttmserver/SolrTTMServer.php b/ttmserver/SolrTTMServer.php
index 972a0d4..8fe26a5 100644
--- a/ttmserver/SolrTTMServer.php
+++ b/ttmserver/SolrTTMServer.php
@@ -38,11 +38,27 @@
}
public function query( $sourceLanguage, $targetLanguage, $text ) {
+ try {
+ return $this-doQuery( $sourceLanguage,
$targetLanguage, $text );
+ } catch ( Solarium_Exception $e ) {
+ throw new TranslationHelperException( 'Solarium
exception: ' . $e );
+ }
+ }
+
+ /// @see ReadableTTMServer::query
+ protected function doQuery( $sourceLanguage, $targetLanguage, $text ) {
/* Two query system:
* 1) Find all strings in source language that match text
* 2) Do another query for translations for those strings
*/
wfProfileIn( __METHOD__ );
+ // For now impose a length limit on query string to avoid doing
+ // very slow queries. Magic number.
+ if ( strlen( $text ) 789 ) {
+ return array();
+ }
+
+
$query = $this-client-createSelect();
$query-setFields( array( 'globalid', 'content', 'score' ) );
@@ -70,12 +86,8 @@
$query-createFilterQuery( 'lang' )
-setQuery( 'language:%P1%', array( $sourceLanguage ) );
- // Converting Solarium exceptions to our exceptions
- try {
- $resultset = $this-client-select( $query );
- } catch ( Solarium_Exception $e ) {
- throw new TranslationHelperException( 'Solarium
exception: ' . $e );
- }
+
+ $resultset = $this-client-select( $query );
/* This query is doing two unrelated things:
* 1) Collect the message contents and scores so that they can
@@ -105,11 +117,7 @@
// With AND we would not find anything, obviously.
$fetchQuery-setQueryDefaultOperator(
Solarium_Query_Select::QUERY_OPERATOR_OR );
- try {
- $translations = $this-client-select( $fetchQuery );
- } catch ( Solarium_Exception $e ) {
- throw new TranslationHelperException( 'Solarium
exception: ' . $e );
- }
+ $translations = $this-client-select( $fetchQuery );
$suggestions = array();
foreach ( $translations as $doc ) {
--
To view, visit https://gerrit.wikimedia.org/r/54334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10ad6aded1dcab68f453767c08ba1dd77e2302d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some bandage to avoid fatal errors in non-TUX - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Some bandage to avoid fatal errors in non-TUX
..
Some bandage to avoid fatal errors in non-TUX
Bug: 44137
Change-Id: If4f11abcf4c571b43be901b801321e7a032a4b63
---
M utils/TranslationEditPage.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index ff52e9a..8a3b029 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
@@ -86,7 +86,14 @@
return;
}
- $translation = $helpers-getTranslation();
+ $handle = new MessageHandle( $this-getTitle() );
+ $groupId = MessageIndex::getPrimaryGroupId( $handle );
+
+ $translatio = '';
+ if ( $groupId ) {
+ $translation = $helpers-getTranslation();
+ }
+
$targetLang = Language::factory( $helpers-getTargetLanguage()
);
$textareaParams = array(
'name' = 'text',
@@ -98,7 +105,7 @@
'dir' = $targetLang-getDir(),
);
- if ( !$wgUser-isAllowed( 'translate' ) ) {
+ if ( $groupId || !$wgUser-isAllowed( 'translate' ) ) {
$textareaParams['readonly'] = 'readonly';
}
--
To view, visit https://gerrit.wikimedia.org/r/54335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4f11abcf4c571b43be901b801321e7a032a4b63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45734) Handle invalid group in user friendly way - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45734) Handle invalid group in user friendly way
..
(bug 45734) Handle invalid group in user friendly way
Change-Id: I24ba035841f0e3f9ab26c91c1bc53a258b35cd54
---
M Translate.i18n.php
M resources/css/ext.translate.special.translate.css
M specials/SpecialTranslate.php
3 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 1b4f6d5..963c9df 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -486,6 +486,7 @@
'tux-empty-list-all' = 'This message group is empty',
'tux-empty-list-all-guide' = 'Select a different message group to
translate',
+ 'tux-translate-page-no-such-group' = '''The indicated group does not
exist.''' Select a different message group.,
'tux-empty-list-translated' = 'No translated messages',
'tux-empty-list-translated-guide' = 'You can help translating',
@@ -1099,6 +1100,7 @@
* {{msg-mw|Translate-messagereview-reviewswithyou}}',
'tux-empty-list-all' = '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-all-guide' = '{{Tuxspec|7}} This is a secondary guide
text.',
+ 'tux-translate-page-no-such-group' = 'An error message that appears
about the group selector on Special:Translate when an invalid group was
requested.',
'tux-empty-list-translated' = '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-translated-guide' = '{{Tuxspec|7}} This is a secondary
guide text.',
'tux-empty-list-translated-action' = '{{Tuxspec|7}} This is a action
button.
diff --git a/resources/css/ext.translate.special.translate.css
b/resources/css/ext.translate.special.translate.css
index 1c43581..9be382c 100644
--- a/resources/css/ext.translate.special.translate.css
+++ b/resources/css/ext.translate.special.translate.css
@@ -118,13 +118,13 @@
margin: 5px 0;
}
-.tux-editor-header .group-warning {
+.group-warning {
background: #FFF5AA;
padding: 5px;
margin: 5px 0;
}
-.tux-editor-header .group-warning:empty {
+.group-warning:empty {
display: none;
}
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index a8f70f4..2c03a44 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -70,6 +70,7 @@
$out-addHTML( Html::openElement( 'div', array(
'class' = 'grid ext-translate-container',
) ) );
+
$out-addHTML( $this-tuxSettingsForm( $errors ) );
$out-addHTML( $this-messageSelector() );
} else {
@@ -226,10 +227,12 @@
$this-options['group'] = $this-defaults['group'];
} else {
$languages = $this-group-getTranslatableLanguages();
+
if ( $languages !== null !isset(
$languages[$this-options['language']] ) ) {
$errors['language'] = $this-msg(
'translate-language-disabled' )-text();
}
}
+
return $errors;
}
@@ -686,6 +689,16 @@
public function groupInformation() {
$output = $this-getOutput();
+ // If we get here in the TUX mode, it means that invalid group
+ // was requested. There is default group for no params case.
+ if ( self::isBeta( $this-getRequest() ) ) {
+ $output-addHtml( Html::rawElement(
+ 'div',
+ array( 'class' = 'twelve columns
group-warning' ),
+ $this-msg( 'tux-translate-page-no-such-group'
)-parse()
+ ) );
+ }
+
$output-addHtml(
Html::openElement( 'div', array(
'class' = 'eight columns
ext-translate-msggroup-selector',
--
To view, visit https://gerrit.wikimedia.org/r/54212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24ba035841f0e3f9ab26c91c1bc53a258b35cd54
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed regression that non-OpenID login links were not suppre... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54332
Change subject: fixed regression that non-OpenID login links were not
suppressed if $wgOpenIDOnly
..
fixed regression that non-OpenID login links were not suppressed if
$wgOpenIDOnly
Change-Id: I2ffe0f3e57c09e34b7a8b1e6640a26b61ce8a5c7
---
M OpenID.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/32/54332/1
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 831d903..dfb85f3 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -98,7 +98,7 @@
if ( $wgOpenIDOnly ) {
# remove other login links
- foreach ( array( 'login', 'anonlogin' ) as $k )
{
+ foreach ( array( 'createaccount', 'login',
'anonlogin' ) as $k ) {
if ( array_key_exists( $k,
$personal_urls ) ) {
unset( $personal_urls[$k] );
}
--
To view, visit https://gerrit.wikimedia.org/r/54332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ffe0f3e57c09e34b7a8b1e6640a26b61ce8a5c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed regression that non-OpenID login links were not suppre... - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: fixed regression that non-OpenID login links were not
suppressed if $wgOpenIDOnly
..
fixed regression that non-OpenID login links were not suppressed if
$wgOpenIDOnly
Change-Id: I2ffe0f3e57c09e34b7a8b1e6640a26b61ce8a5c7
---
M OpenID.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 831d903..dfb85f3 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -98,7 +98,7 @@
if ( $wgOpenIDOnly ) {
# remove other login links
- foreach ( array( 'login', 'anonlogin' ) as $k )
{
+ foreach ( array( 'createaccount', 'login',
'anonlogin' ) as $k ) {
if ( array_key_exists( $k,
$personal_urls ) ) {
unset( $personal_urls[$k] );
}
--
To view, visit https://gerrit.wikimedia.org/r/54332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ffe0f3e57c09e34b7a8b1e6640a26b61ce8a5c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
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 error suppression in Exif::isRational - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove error suppression in Exif::isRational
..
Remove error suppression in Exif::isRational
preg_match throws warning, when getting a array as input, but there is a
is_array check, so no need for error suppression
Change-Id: Ie7f180f45c04e8e396186cd6a5a9e40e2c94a80a
---
M includes/media/Exif.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 20b84d5..1767180 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -677,7 +677,7 @@
*/
private function isRational( $in ) {
$m = array();
- if ( !is_array( $in ) @preg_match(
'/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/', $in, $m ) ) { # Avoid division by zero
+ if ( !is_array( $in ) preg_match(
'/^(\d+)\/(\d+[1-9]|[1-9]\d*)$/', $in, $m ) ) { # Avoid division by zero
return $this-isLong( $m[1] ) $this-isLong( $m[2] );
} else {
$this-debug( $in, __FUNCTION__, 'fed a non-fraction
value' );
--
To view, visit https://gerrit.wikimedia.org/r/54215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f180f45c04e8e396186cd6a5a9e40e2c94a80a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: IAlex ialex.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs. $wgOpenID... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54333
Change subject: hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs.
$wgOpenIDClientOnly
..
hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs. $wgOpenIDClientOnly
Change-Id: Ieef24f1a8a8a3ea472ad313e1514b1984f27e928
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
3 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/33/54333/1
diff --git a/CHANGES b/CHANGES
index ab44638..c8d4aa0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.09 20130318 hotfix typo $wgOpenIDOnlyClient vs. $wgOpenIDClientOnly
3.08 20130318 SpecialOpenIDIdentifier only shows the name for visiting user
otherwise only the User ID, or an error if invalid User ID
3.07 20130316 (bug 46052) make storage methods obeying and using
$wgTmpDirectory
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index dfb85f3..3d6ad61 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -263,7 +263,7 @@
*/
public static function onGetPreferences( $user, $preferences ) {
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
- $wgAuth, $wgUser, $wgLang, $wgOpenIDOnlyClient;
+ $wgAuth, $wgUser, $wgLang, $wgOpenIDClientOnly;
switch ( $wgOpenIDShowUrlOnUserPage ) {
@@ -333,7 +333,7 @@
'type' = 'hidden',
);
- if ( !$wgOpenIDOnlyClient ) {
+ if ( !$wgOpenIDClientOnly ) {
$preferences['openid-your-openid'] =
array(
diff --git a/OpenID.php b/OpenID.php
index 30d4011..8dc2843 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.08 20130318' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.09 20130318' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
--
To view, visit https://gerrit.wikimedia.org/r/54333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieef24f1a8a8a3ea472ad313e1514b1984f27e928
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs. $wgOpenID... - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs.
$wgOpenIDClientOnly
..
hotfix legacy typo $wgOpenIDOnlyClient (wrong) vs. $wgOpenIDClientOnly
Change-Id: Ieef24f1a8a8a3ea472ad313e1514b1984f27e928
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CHANGES b/CHANGES
index ab44638..c8d4aa0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.09 20130318 hotfix typo $wgOpenIDOnlyClient vs. $wgOpenIDClientOnly
3.08 20130318 SpecialOpenIDIdentifier only shows the name for visiting user
otherwise only the User ID, or an error if invalid User ID
3.07 20130316 (bug 46052) make storage methods obeying and using
$wgTmpDirectory
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index dfb85f3..3d6ad61 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -263,7 +263,7 @@
*/
public static function onGetPreferences( $user, $preferences ) {
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
- $wgAuth, $wgUser, $wgLang, $wgOpenIDOnlyClient;
+ $wgAuth, $wgUser, $wgLang, $wgOpenIDClientOnly;
switch ( $wgOpenIDShowUrlOnUserPage ) {
@@ -333,7 +333,7 @@
'type' = 'hidden',
);
- if ( !$wgOpenIDOnlyClient ) {
+ if ( !$wgOpenIDClientOnly ) {
$preferences['openid-your-openid'] =
array(
diff --git a/OpenID.php b/OpenID.php
index 30d4011..8dc2843 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.08 20130318' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.09 20130318' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
--
To view, visit https://gerrit.wikimedia.org/r/54333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieef24f1a8a8a3ea472ad313e1514b1984f27e928
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixes suppression of OpenID identifiers if OpenID client mod... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54336
Change subject: fixes suppression of OpenID identifiers if OpenID client mode
only.
..
fixes suppression of OpenID identifiers if OpenID client mode only.
This was not correctly treated in the past, identifiers were shown
even when the wiki was not set to act also as server.
Change-Id: Icb82058814ee4eb8e9cb6f00a5eb838c6525a924
---
M OpenID.hooks.php
M SpecialOpenIDIdentifier.body.php
2 files changed, 62 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/36/54336/1
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 3d6ad61..ebe6ea0 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -71,7 +71,7 @@
$user = User::newFromName( $nt-getText() );
if ( $user ( $user-getID() != 0 ) ) {
- SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true );
+ SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true, false );
}
}
@@ -265,36 +265,40 @@
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
$wgAuth, $wgUser, $wgLang, $wgOpenIDClientOnly;
- switch ( $wgOpenIDShowUrlOnUserPage ) {
+ if ( !$wgOpenIDClientOnly ) {
- case 'user':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'toggle',
- 'label-message' =
'openid-hide-openid-label',
- );
- break;
+ switch ( $wgOpenIDShowUrlOnUserPage ) {
- case 'always':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
- );
- break;
+ case 'user':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'toggle',
+ 'label-message' =
'openid-hide-openid-label',
+ );
+ break;
- case 'never':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
- );
- break;
+ case 'always':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
+ );
+ break;
+
+ case 'never':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
+ );
+ break;
+
+ }
}
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index 310dadc..d8270c4 100644
--- a/SpecialOpenIDIdentifier.body.php
+++
[MediaWiki-commits] [Gerrit] Substitute id generator for superior UIDGenerator - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged.
Change subject: Substitute id generator for superior UIDGenerator
..
Substitute id generator for superior UIDGenerator
Change-Id: Idd57202e961cf1ac8a97776980daf1165211cd23
---
M data/DataModel.php
1 file changed, 5 insertions(+), 40 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/DataModel.php b/data/DataModel.php
index e76abbe..e651a3b 100644
--- a/data/DataModel.php
+++ b/data/DataModel.php
@@ -789,47 +789,12 @@
* @return string
*/
protected function generateId() {
- $time = microtime();
-
- /**
-* Callback method, updating the cached counts. This will
ensure that no
-* multiple concurrent processes that had generated the same
microtime()
-* can result the same value (only 1 of then can be merged)
-*
-* @param BagOStuff $cache
-* @param string $key
-* @param int $existingValue
-* @use string $time Generated unique timestamp
-* @return string
-*/
- $callback = function( BagOStuff $cache, $key, $existingValue )
use ( $time ) {
- while ( $time === microtime() ) {
- /*
-* The only possible way microtime() could
result in a non-unique value,
-* is when it's called at the exact same time.
Stall until microtime()
-* generates a new id.
-*/
- }
-
- return $time;
- };
-
- $key = wfMemcKey( get_called_class(), 'generateId' );
- if ( !static::getCache()-merge( $key, $callback, 1, 1 ) ) {
- /*
-* $time could not be merged, but current microtime()
should have
-* elapsed already - let's restart generating!
-*/
- return $this-generateId();
- }
-
/*
-* At this point, we're certain that $time is unique.
Manipulate the result
-* to not expose the exact timestamp in the ID (not that it
really matters).
-* Don't worry; although theoretically, this lossy manipulation
could again
-* result in the same id's, it won't for at least the first
couple of million
-* years ;)
+* This will return a 128-bit string in base-16, resulting
+* in a 32-character (at max) string of hexadecimal characters.
+* Pad the string to full 32-char length if the value is lower.
*/
- return md5( $time );
+ $id = UIDGenerator::newTimestampedUID128( 16 );
+ return str_pad( $id, 32, 0, STR_PAD_LEFT );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd57202e961cf1ac8a97776980daf1165211cd23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA IN... - change (operations/dumps)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/54337 Change subject: new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA INFILE .. new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA INFILE Change-Id: If74c24b037cfe6a527bb95a6fa8234d21c9fa5c9 --- M xmlfileutils/Makefile M xmlfileutils/README A xmlfileutils/fifo_to_mysql.pl 3 files changed, 525 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps refs/changes/37/54337/1 diff --git a/xmlfileutils/Makefile b/xmlfileutils/Makefile index 1c80f36..1f77d26 100644 --- a/xmlfileutils/Makefile +++ b/xmlfileutils/Makefile @@ -22,12 +22,14 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o sql2txt sql2txt.o filebuffers.o sqlutils.o \ -lbz2 -lz -install: mwxml2sql sql2txt +install: mwxml2sql sql2txt fifo_to_mysql.pl if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi cp -f mwxml2sql $(PREFIX)/bin/mwxml2sql cp -f sql2txt $(PREFIX)/bin/sql2txt + cp -f fifo_to_mysql.pl $(PREFIX)/bin/fifo_to_mysql.pl chmod a+x $(PREFIX)/bin/mwxml2sql chmod a+x $(PREFIX)/bin/sql2txt + chmod a+x $(PREFIX)/bin/fifo_to_mysql.pl clean: rm -f *.o *.a mwxml2sql sql2txt @@ -85,6 +87,7 @@ $(DISTNAME)/sha1.h \ $(DISTNAME)/sha1.c \ $(DISTNAME)/base36.c \ + $(DISTNAME)/fifo_to_mysql.pl \ $(DISTNAME)/Makefile \ $(DISTNAME)/COPYING \ $(DISTNAME)/README \ diff --git a/xmlfileutils/README b/xmlfileutils/README index 6138091..b6d9cd6 100644 --- a/xmlfileutils/README +++ b/xmlfileutils/README @@ -1,4 +1,4 @@ -This is a small set of tools to help folsk who want to import +This is a small set of tools to help folks who want to import XML dumps into a local instance of MediaWiki. Tools: @@ -13,7 +13,7 @@ xml dumps from the Wikimedia projects and that is all that it's intended to do. -To install this program, you will need to have the libz and +To install and run this program, you will need to have the libz and bz2 development libraries installed, as well as the gcc toolchain or an equivalent C compiler and its supporting libraries. You'll also need the 'make' utility. @@ -25,6 +25,23 @@ LOAD DATA INFILE, a much faster process than having mysql do a pile of INSERTS. If you feed it data formatted differently from that output, or with rows broken across lines etc, it may produce garbage. + +To install and run this program, you will need to have the libz and +bz2 development libraries installed, as well as the gcc +toolchain or an equivalent C compiler and its supporting +libraries. You'll also need the 'make' utility. + +fifo_to_mysql.pl + +This reads a tab-delimited file of table records, writes it +in chunks to a specified fifo, and forks mysql to LOAD DATA INFILE +from that fifo for each chunk. + +To install and run this program, you will need to have the libz and +bz2 libraries installed, as well as the perl IO::Compress::Gzip, +IO::Compress::Bzip2, Fcntl and POSIX modules. These are core modules +so they should come by default with your perl package. You'll also +need the 'make' utility. These programs have been tested only on 64-bit Linux and on FreeBSD. You can try building them on other platforms but without any support @@ -42,6 +59,8 @@ RUNNING +A. mwxml2sql + 'mwxml2sql --help' will give you a comprehensive usage message. @@ -55,6 +74,7 @@ -t testing/enwiki-pages-1114-1300.gz \ -f testing/sql_enwiki-1114-1300.gz -p t_ -m 1.20 +In this example, we have: -v: print progress messages -s: stubs file for input -t: text (page content) file for input @@ -84,6 +104,57 @@ A run of mwimport (perl script) on the same hardware took slightly over two hours. +B. sql2txt + +'sql2txt --help' will give you a comprehensive usage +message. + +TL;DR version: you need a possibly compressed (gz or bz2) file +containing sql insert statements; provide this to sql2txt and +save the tab delimited and escaped results to a (possibly +compressed) file. + +Example use: + +sql2txt -v -s testing/enwiki-iwlinks.sql.bz2 \ + -t testing/enwiki-iwlinks.tabs.bz2 + +In this example, we have: +-v: print progress messages +-s: sql file for input +-t: tab delimited text file for output + +C. fifo_to_mysql.pl + +'fifo_to_mysql.pl --help' will give you a comprehensive usage +message. + +TL;DR version: you need a possibly compressed (gz or bz2) file +containing tab-delimted and escaped data for an sql table; +stuff your MySQL password in a conf file, provide fifo_to_mysql.pl +with the sql filename, the conf file name, the db and table names +and the number of bytes or lines to send to mysql per chunk, and +it will write chunks of the data to a fifo, spawning mysql to +LOAD DATA INFILE from that fifo for each chunk. + +Example use: + +for i in pagelinks page_props
[MediaWiki-commits] [Gerrit] Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml - change (mediawiki/core)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54338
Change subject: Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml
..
Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml
* CLDR does not define plural rules for sgs.
* Port the plural rules present in LanguageSgs.php to CLDR plural
definition syntax
* Remove LanguageSgs.php
* Update the tests, reorder/rename the plural form names
Change-Id: I44658402d69a6805cdfd189fe780eadee94056c7
---
D languages/classes/LanguageSgs.php
M languages/data/plurals-mediawiki.xml
M tests/phpunit/languages/LanguageSgsTest.php
3 files changed, 15 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/54338/1
diff --git a/languages/classes/LanguageSgs.php
b/languages/classes/LanguageSgs.php
deleted file mode 100644
index 0c74e45..000
--- a/languages/classes/LanguageSgs.php
+++ /dev/null
@@ -1,52 +0,0 @@
-?php
-/**
- * Samogitian (Žemaitėška) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Niklas Laxström
- * @ingroup Language
- */
-
-/**
- * Samogitian (Žemaitėška)
- *
- * @ingroup Language
- */
-class LanguageSgs extends Language {
-
- /**
-* @param $count int
-* @param $forms array
-* @return string
-*/
- function convertPlural( $count, $forms ) {
- if ( !count( $forms ) ) { return ''; }
- $forms = $this-preConvertPlural( $forms, 4 );
-
- $count = abs( $count );
- if ( $count == 0 || ( $count % 100 === 0 || ( $count % 100 =
10 $count % 100 20 ) ) ) {
- return $forms[2];
- } elseif ( $count % 10 === 1 ) {
- return $forms[0];
- } elseif ( $count % 10 === 2 ) {
- return $forms[1];
- } else {
- return $forms[3];
- }
- }
-}
diff --git a/languages/data/plurals-mediawiki.xml
b/languages/data/plurals-mediawiki.xml
index 5c4f193..07e157a 100644
--- a/languages/data/plurals-mediawiki.xml
+++ b/languages/data/plurals-mediawiki.xml
@@ -27,5 +27,10 @@
pluralRules locales=bho
pluralRule count=onen in 0..1/pluralRule
/pluralRules
+ pluralRules locales=sgs
+ pluralRule count=onen mod 10 is 1 and n mod 100 is
not 11/pluralRule
+ pluralRule count=twon mod 10 is 2 and n mod 100 is
not 12/pluralRule
+ pluralRule count=fewn is 0 or n mod 100 is 0 or n
mod 100 in 10..19/pluralRule
+ /pluralRules
/plurals
/supplementalData
diff --git a/tests/phpunit/languages/LanguageSgsTest.php
b/tests/phpunit/languages/LanguageSgsTest.php
index 8a6e979..95e6346 100644
--- a/tests/phpunit/languages/LanguageSgsTest.php
+++ b/tests/phpunit/languages/LanguageSgsTest.php
@@ -10,25 +10,25 @@
/** @dataProvider providePluralAllForms */
function testPluralAllForms( $result, $value ) {
- $forms = array( 'one', 'few', 'many', 'other' );
+ $forms = array( 'one', 'two', 'few', 'other' );
$this-assertEquals( $result, $this-getLang()-convertPlural(
$value, $forms ) );
}
function providePluralAllForms() {
return array(
- array( 'many', 0 ),
+ array( 'few', 0 ),
array( 'one', 1 ),
- array( 'few', 2 ),
+ array( 'two', 2 ),
array( 'other', 3 ),
- array( 'many', 10 ),
- array( 'many', 11 ),
- array( 'many', 12 ),
- array( 'many', 19 ),
+ array( 'few', 10 ),
+ array( 'few', 11 ),
+ array( 'few', 12 ),
+ array( 'few', 19 ),
array( 'other', 20 ),
- array( 'many', 100 ),
+ array( 'few', 100 ),
[MediaWiki-commits] [Gerrit] renamed $wgOpenIDOnly to $wgOpenIDLoginOnly - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54339
Change subject: renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
..
renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
Change-Id: I7fa64ca7cc6af887e52733804f7ea8ecc0ca663b
---
M OpenID.hooks.php
M SpecialOpenIDIdentifier.body.php
2 files changed, 62 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/39/54339/1
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 3d6ad61..ebe6ea0 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -71,7 +71,7 @@
$user = User::newFromName( $nt-getText() );
if ( $user ( $user-getID() != 0 ) ) {
- SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true );
+ SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true, false );
}
}
@@ -265,36 +265,40 @@
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
$wgAuth, $wgUser, $wgLang, $wgOpenIDClientOnly;
- switch ( $wgOpenIDShowUrlOnUserPage ) {
+ if ( !$wgOpenIDClientOnly ) {
- case 'user':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'toggle',
- 'label-message' =
'openid-hide-openid-label',
- );
- break;
+ switch ( $wgOpenIDShowUrlOnUserPage ) {
- case 'always':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
- );
- break;
+ case 'user':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'toggle',
+ 'label-message' =
'openid-hide-openid-label',
+ );
+ break;
- case 'never':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
- );
- break;
+ case 'always':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
+ );
+ break;
+
+ case 'never':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
+ );
+ break;
+
+ }
}
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index 310dadc..d8270c4 100644
--- a/SpecialOpenIDIdentifier.body.php
+++ b/SpecialOpenIDIdentifier.body.php
@@ -30,8 +30,16 @@
}
function execute( $par ) {
+ global $wgOpenIDClientOnly, $wgOut;
$this-setHeaders();
-
[MediaWiki-commits] [Gerrit] renamed $wgOpenIDOnly to $wgOpenIDLoginOnly - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
..
renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
Change-Id: I7fa64ca7cc6af887e52733804f7ea8ecc0ca663b
---
M OpenID.hooks.php
M SpecialOpenIDIdentifier.body.php
2 files changed, 62 insertions(+), 43 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 3d6ad61..ebe6ea0 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -71,7 +71,7 @@
$user = User::newFromName( $nt-getText() );
if ( $user ( $user-getID() != 0 ) ) {
- SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true );
+ SpecialOpenIDIdentifier::showOpenIDIdentifier(
$user, true, false );
}
}
@@ -265,36 +265,40 @@
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
$wgAuth, $wgUser, $wgLang, $wgOpenIDClientOnly;
- switch ( $wgOpenIDShowUrlOnUserPage ) {
+ if ( !$wgOpenIDClientOnly ) {
- case 'user':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'toggle',
- 'label-message' =
'openid-hide-openid-label',
- );
- break;
+ switch ( $wgOpenIDShowUrlOnUserPage ) {
- case 'always':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
- );
- break;
+ case 'user':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'toggle',
+ 'label-message' =
'openid-hide-openid-label',
+ );
+ break;
- case 'never':
- $preferences['openid-hide-openid'] =
- array(
- 'section' =
'openid/openid-hide-openid',
- 'type' = 'info',
- 'label-message' =
'openid-hide-openid-label',
- 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
- );
- break;
+ case 'always':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-always' )-text(),
+ );
+ break;
+
+ case 'never':
+ $preferences['openid-hide-openid'] =
+ array(
+ 'section' =
'openid/openid-hide-openid',
+ 'type' = 'info',
+ 'label-message' =
'openid-hide-openid-label',
+ 'default' = wfMessage(
'openid-show-openid-url-on-userpage-never' )-text(),
+ );
+ break;
+
+ }
}
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index 310dadc..d8270c4 100644
--- a/SpecialOpenIDIdentifier.body.php
+++ b/SpecialOpenIDIdentifier.body.php
@@ -30,8 +30,16 @@
}
function execute( $par ) {
+ global $wgOpenIDClientOnly, $wgOut;
$this-setHeaders();
- self::showOpenIDIdentifier(
[MediaWiki-commits] [Gerrit] renamed $wgOpenIDOnly to $wgOpenIDLoginOnly - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54340
Change subject: renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
..
renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
Change-Id: Ie1c3ab0f866514b88f77b3cb38fa4dcff23aceb8
---
M CHANGES
M OpenID.hooks.php
M OpenID.i18n.php
M OpenID.php
M README.OpenID-mediawiki-extension
M SpecialOpenIDConvert.body.php
M SpecialOpenIDDashboard.body.php
M SpecialOpenIDLogin.body.php
M TODO
9 files changed, 22 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/40/54340/2
diff --git a/CHANGES b/CHANGES
index c8d4aa0..02edf74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.10 20130318 renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
3.09 20130318 hotfix typo $wgOpenIDOnlyClient vs. $wgOpenIDClientOnly
3.08 20130318 SpecialOpenIDIdentifier only shows the name for visiting user
otherwise only the User ID, or an error if invalid User ID
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index ebe6ea0..43bf548 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -18,11 +18,11 @@
class OpenIDHooks {
public static function onSpecialPage_initList( $list ) {
- global $wgOpenIDOnly, $wgOpenIDClientOnly,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
+ global $wgOpenIDLoginOnly, $wgOpenIDClientOnly,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
$wgOpenIDSmallLogoUrl = self::getOpenIDSmallLogoUrl();
- if ( $wgOpenIDOnly ) {
+ if ( $wgOpenIDLoginOnly ) {
$list['Userlogin'] = 'SpecialOpenIDLogin';
# as Special:CreateAccount is an alias for
Special:UserLogin/signup
@@ -84,7 +84,7 @@
* @return bool
*/
public static function onPersonalUrls( $personal_urls, $title ) {
- global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDOnly;
+ global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDLoginOnly;
if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$sk = $wgUser-getSkin();
@@ -96,7 +96,7 @@
'active' = $title-isSpecial( 'OpenIDLogin' )
);
- if ( $wgOpenIDOnly ) {
+ if ( $wgOpenIDLoginOnly ) {
# remove other login links
foreach ( array( 'createaccount', 'login',
'anonlogin' ) as $k ) {
if ( array_key_exists( $k,
$personal_urls ) ) {
diff --git a/OpenID.i18n.php b/OpenID.i18n.php
index 0cc64e8..5f706fb 100644
--- a/OpenID.i18n.php
+++ b/OpenID.i18n.php
@@ -342,16 +342,16 @@
'openidlogininstructions' = 'Used as instruction text for the Login
form in Special:OpenIDLogin.
This message is followed by any one of the following messages:
-* {{msg-mw|openidlogininstructions-openidloginonly|if
code$wgOpenIDOnly/code is TRUE}}
-* {{msg-mw|openidlogininstructions-passwordloginallowed|if
code$wgOpenIDOnly/code is FALSE}}',
- 'openidlogininstructions-openidloginonly' = 'Used as instruction text
for the Login form in Special:OpenIDLogin, if code$wgOpenIDOnly/code is
TRUE.
+* {{msg-mw|openidlogininstructions-openidloginonly|if
code$wgOpenIDLoginOnly/code is TRUE}}
+* {{msg-mw|openidlogininstructions-passwordloginallowed|if
code$wgOpenIDLoginOnly/code is FALSE}}',
+ 'openidlogininstructions-openidloginonly' = 'Used as instruction text
for the Login form in Special:OpenIDLogin, if code$wgOpenIDLoginOnly/code
is TRUE.
This message follows the message:
* {{msg-mw|Openidlogininstructions}}
See also:
* {{msg-mw|Openidlogininstructions-passwordloginallowed}}',
- 'openidlogininstructions-passwordloginallowed' = 'Used as instruction
text for the Login form in Special:OpenIDLogin, if code$wgOpenIDOnly/code
is FALSE.
+ 'openidlogininstructions-passwordloginallowed' = 'Used as instruction
text for the Login form in Special:OpenIDLogin, if
code$wgOpenIDLoginOnly/code is FALSE.
This message follows the message:
* {{msg-mw|Openidlogininstructions}}
diff --git a/OpenID.php b/OpenID.php
index 8dc2843..3fbcf83 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.09 20130318' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.10 20130318' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
@@ -189,9 +189,10 @@
$wgOpenIDCookieExpiration = 365 * 24 * 60 * 60;
/**
- * Only allow login with OpenID. Careful -- this means everybody!
+ * Only allow login with OpenID.
+ * Default: true
*/
-$wgOpenIDOnly = false;
+$wgOpenIDLoginOnly = true;
/**
* If true, user accounts on this wiki *cannot
[MediaWiki-commits] [Gerrit] renamed $wgOpenIDOnly to $wgOpenIDLoginOnly - change (mediawiki...OpenID)
jenkins-bot has submitted this change and it was merged.
Change subject: renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
..
renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
Change-Id: Ie1c3ab0f866514b88f77b3cb38fa4dcff23aceb8
---
M CHANGES
M OpenID.hooks.php
M OpenID.i18n.php
M OpenID.php
M README.OpenID-mediawiki-extension
M SpecialOpenIDConvert.body.php
M SpecialOpenIDDashboard.body.php
M SpecialOpenIDLogin.body.php
M TODO
9 files changed, 22 insertions(+), 20 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/CHANGES b/CHANGES
index c8d4aa0..02edf74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.10 20130318 renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
3.09 20130318 hotfix typo $wgOpenIDOnlyClient vs. $wgOpenIDClientOnly
3.08 20130318 SpecialOpenIDIdentifier only shows the name for visiting user
otherwise only the User ID, or an error if invalid User ID
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index ebe6ea0..43bf548 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -18,11 +18,11 @@
class OpenIDHooks {
public static function onSpecialPage_initList( $list ) {
- global $wgOpenIDOnly, $wgOpenIDClientOnly,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
+ global $wgOpenIDLoginOnly, $wgOpenIDClientOnly,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
$wgOpenIDSmallLogoUrl = self::getOpenIDSmallLogoUrl();
- if ( $wgOpenIDOnly ) {
+ if ( $wgOpenIDLoginOnly ) {
$list['Userlogin'] = 'SpecialOpenIDLogin';
# as Special:CreateAccount is an alias for
Special:UserLogin/signup
@@ -84,7 +84,7 @@
* @return bool
*/
public static function onPersonalUrls( $personal_urls, $title ) {
- global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDOnly;
+ global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDLoginOnly;
if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$sk = $wgUser-getSkin();
@@ -96,7 +96,7 @@
'active' = $title-isSpecial( 'OpenIDLogin' )
);
- if ( $wgOpenIDOnly ) {
+ if ( $wgOpenIDLoginOnly ) {
# remove other login links
foreach ( array( 'createaccount', 'login',
'anonlogin' ) as $k ) {
if ( array_key_exists( $k,
$personal_urls ) ) {
diff --git a/OpenID.i18n.php b/OpenID.i18n.php
index 0cc64e8..5f706fb 100644
--- a/OpenID.i18n.php
+++ b/OpenID.i18n.php
@@ -342,16 +342,16 @@
'openidlogininstructions' = 'Used as instruction text for the Login
form in Special:OpenIDLogin.
This message is followed by any one of the following messages:
-* {{msg-mw|openidlogininstructions-openidloginonly|if
code$wgOpenIDOnly/code is TRUE}}
-* {{msg-mw|openidlogininstructions-passwordloginallowed|if
code$wgOpenIDOnly/code is FALSE}}',
- 'openidlogininstructions-openidloginonly' = 'Used as instruction text
for the Login form in Special:OpenIDLogin, if code$wgOpenIDOnly/code is
TRUE.
+* {{msg-mw|openidlogininstructions-openidloginonly|if
code$wgOpenIDLoginOnly/code is TRUE}}
+* {{msg-mw|openidlogininstructions-passwordloginallowed|if
code$wgOpenIDLoginOnly/code is FALSE}}',
+ 'openidlogininstructions-openidloginonly' = 'Used as instruction text
for the Login form in Special:OpenIDLogin, if code$wgOpenIDLoginOnly/code
is TRUE.
This message follows the message:
* {{msg-mw|Openidlogininstructions}}
See also:
* {{msg-mw|Openidlogininstructions-passwordloginallowed}}',
- 'openidlogininstructions-passwordloginallowed' = 'Used as instruction
text for the Login form in Special:OpenIDLogin, if code$wgOpenIDOnly/code
is FALSE.
+ 'openidlogininstructions-passwordloginallowed' = 'Used as instruction
text for the Login form in Special:OpenIDLogin, if
code$wgOpenIDLoginOnly/code is FALSE.
This message follows the message:
* {{msg-mw|Openidlogininstructions}}
diff --git a/OpenID.php b/OpenID.php
index 8dc2843..3fbcf83 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.09 20130318' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.10 20130318' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
@@ -189,9 +189,10 @@
$wgOpenIDCookieExpiration = 365 * 24 * 60 * 60;
/**
- * Only allow login with OpenID. Careful -- this means everybody!
+ * Only allow login with OpenID.
+ * Default: true
*/
-$wgOpenIDOnly = false;
+$wgOpenIDLoginOnly = true;
/**
* If true, user accounts on this wiki *cannot* be used as OpenIDs on other
diff --git
[MediaWiki-commits] [Gerrit] new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA IN... - change (operations/dumps)
ArielGlenn has submitted this change and it was merged. Change subject: new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA INFILE .. new tool fifo_to_mysql.pl for feeding chunks to LOAD DATA INFILE Change-Id: If74c24b037cfe6a527bb95a6fa8234d21c9fa5c9 --- M xmlfileutils/Makefile M xmlfileutils/README A xmlfileutils/fifo_to_mysql.pl 3 files changed, 525 insertions(+), 10 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/xmlfileutils/Makefile b/xmlfileutils/Makefile index 1c80f36..1f77d26 100644 --- a/xmlfileutils/Makefile +++ b/xmlfileutils/Makefile @@ -22,12 +22,14 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o sql2txt sql2txt.o filebuffers.o sqlutils.o \ -lbz2 -lz -install: mwxml2sql sql2txt +install: mwxml2sql sql2txt fifo_to_mysql.pl if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi cp -f mwxml2sql $(PREFIX)/bin/mwxml2sql cp -f sql2txt $(PREFIX)/bin/sql2txt + cp -f fifo_to_mysql.pl $(PREFIX)/bin/fifo_to_mysql.pl chmod a+x $(PREFIX)/bin/mwxml2sql chmod a+x $(PREFIX)/bin/sql2txt + chmod a+x $(PREFIX)/bin/fifo_to_mysql.pl clean: rm -f *.o *.a mwxml2sql sql2txt @@ -85,6 +87,7 @@ $(DISTNAME)/sha1.h \ $(DISTNAME)/sha1.c \ $(DISTNAME)/base36.c \ + $(DISTNAME)/fifo_to_mysql.pl \ $(DISTNAME)/Makefile \ $(DISTNAME)/COPYING \ $(DISTNAME)/README \ diff --git a/xmlfileutils/README b/xmlfileutils/README index 6138091..b6d9cd6 100644 --- a/xmlfileutils/README +++ b/xmlfileutils/README @@ -1,4 +1,4 @@ -This is a small set of tools to help folsk who want to import +This is a small set of tools to help folks who want to import XML dumps into a local instance of MediaWiki. Tools: @@ -13,7 +13,7 @@ xml dumps from the Wikimedia projects and that is all that it's intended to do. -To install this program, you will need to have the libz and +To install and run this program, you will need to have the libz and bz2 development libraries installed, as well as the gcc toolchain or an equivalent C compiler and its supporting libraries. You'll also need the 'make' utility. @@ -25,6 +25,23 @@ LOAD DATA INFILE, a much faster process than having mysql do a pile of INSERTS. If you feed it data formatted differently from that output, or with rows broken across lines etc, it may produce garbage. + +To install and run this program, you will need to have the libz and +bz2 development libraries installed, as well as the gcc +toolchain or an equivalent C compiler and its supporting +libraries. You'll also need the 'make' utility. + +fifo_to_mysql.pl + +This reads a tab-delimited file of table records, writes it +in chunks to a specified fifo, and forks mysql to LOAD DATA INFILE +from that fifo for each chunk. + +To install and run this program, you will need to have the libz and +bz2 libraries installed, as well as the perl IO::Compress::Gzip, +IO::Compress::Bzip2, Fcntl and POSIX modules. These are core modules +so they should come by default with your perl package. You'll also +need the 'make' utility. These programs have been tested only on 64-bit Linux and on FreeBSD. You can try building them on other platforms but without any support @@ -42,6 +59,8 @@ RUNNING +A. mwxml2sql + 'mwxml2sql --help' will give you a comprehensive usage message. @@ -55,6 +74,7 @@ -t testing/enwiki-pages-1114-1300.gz \ -f testing/sql_enwiki-1114-1300.gz -p t_ -m 1.20 +In this example, we have: -v: print progress messages -s: stubs file for input -t: text (page content) file for input @@ -84,6 +104,57 @@ A run of mwimport (perl script) on the same hardware took slightly over two hours. +B. sql2txt + +'sql2txt --help' will give you a comprehensive usage +message. + +TL;DR version: you need a possibly compressed (gz or bz2) file +containing sql insert statements; provide this to sql2txt and +save the tab delimited and escaped results to a (possibly +compressed) file. + +Example use: + +sql2txt -v -s testing/enwiki-iwlinks.sql.bz2 \ + -t testing/enwiki-iwlinks.tabs.bz2 + +In this example, we have: +-v: print progress messages +-s: sql file for input +-t: tab delimited text file for output + +C. fifo_to_mysql.pl + +'fifo_to_mysql.pl --help' will give you a comprehensive usage +message. + +TL;DR version: you need a possibly compressed (gz or bz2) file +containing tab-delimted and escaped data for an sql table; +stuff your MySQL password in a conf file, provide fifo_to_mysql.pl +with the sql filename, the conf file name, the db and table names +and the number of bytes or lines to send to mysql per chunk, and +it will write chunks of the data to a fifo, spawning mysql to +LOAD DATA INFILE from that fifo for each chunk. + +Example use: + +for i in pagelinks page_props page redirect revision site_stats
[MediaWiki-commits] [Gerrit] Remove error suppression from Parser::formatHeadings - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove error suppression from Parser::formatHeadings
..
Remove error suppression from Parser::formatHeadings
The array index looks always initialized
Change-Id: I63a1c264ded0c4a744ee990de9bef4f8f9d20d1d
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 7f21449..99042ae 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4158,7 +4158,7 @@
$levelCount[$toclevel] = $level;
# count number of headlines for each level
- @$sublevelCount[$toclevel]++;
+ $sublevelCount[$toclevel]++;
$dot = 0;
for( $i = 1; $i = $toclevel; $i++ ) {
if ( !empty( $sublevelCount[$i] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/54214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63a1c264ded0c4a744ee990de9bef4f8f9d20d1d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: IAlex ialex.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml
..
Move plural rules of Samogitian(sgs) to plurals-mediawiki.xml
* CLDR does not define plural rules for sgs.
* Port the plural rules present in LanguageSgs.php to CLDR plural
definition syntax
* Remove LanguageSgs.php
* Update the tests, reorder/rename the plural form names
Change-Id: I44658402d69a6805cdfd189fe780eadee94056c7
---
D languages/classes/LanguageSgs.php
M languages/data/plurals-mediawiki.xml
M tests/phpunit/languages/LanguageSgsTest.php
3 files changed, 15 insertions(+), 62 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/classes/LanguageSgs.php
b/languages/classes/LanguageSgs.php
deleted file mode 100644
index 0c74e45..000
--- a/languages/classes/LanguageSgs.php
+++ /dev/null
@@ -1,52 +0,0 @@
-?php
-/**
- * Samogitian (Žemaitėška) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Niklas Laxström
- * @ingroup Language
- */
-
-/**
- * Samogitian (Žemaitėška)
- *
- * @ingroup Language
- */
-class LanguageSgs extends Language {
-
- /**
-* @param $count int
-* @param $forms array
-* @return string
-*/
- function convertPlural( $count, $forms ) {
- if ( !count( $forms ) ) { return ''; }
- $forms = $this-preConvertPlural( $forms, 4 );
-
- $count = abs( $count );
- if ( $count == 0 || ( $count % 100 === 0 || ( $count % 100 =
10 $count % 100 20 ) ) ) {
- return $forms[2];
- } elseif ( $count % 10 === 1 ) {
- return $forms[0];
- } elseif ( $count % 10 === 2 ) {
- return $forms[1];
- } else {
- return $forms[3];
- }
- }
-}
diff --git a/languages/data/plurals-mediawiki.xml
b/languages/data/plurals-mediawiki.xml
index 5c4f193..07e157a 100644
--- a/languages/data/plurals-mediawiki.xml
+++ b/languages/data/plurals-mediawiki.xml
@@ -27,5 +27,10 @@
pluralRules locales=bho
pluralRule count=onen in 0..1/pluralRule
/pluralRules
+ pluralRules locales=sgs
+ pluralRule count=onen mod 10 is 1 and n mod 100 is
not 11/pluralRule
+ pluralRule count=twon mod 10 is 2 and n mod 100 is
not 12/pluralRule
+ pluralRule count=fewn is 0 or n mod 100 is 0 or n
mod 100 in 10..19/pluralRule
+ /pluralRules
/plurals
/supplementalData
diff --git a/tests/phpunit/languages/LanguageSgsTest.php
b/tests/phpunit/languages/LanguageSgsTest.php
index 8a6e979..95e6346 100644
--- a/tests/phpunit/languages/LanguageSgsTest.php
+++ b/tests/phpunit/languages/LanguageSgsTest.php
@@ -10,25 +10,25 @@
/** @dataProvider providePluralAllForms */
function testPluralAllForms( $result, $value ) {
- $forms = array( 'one', 'few', 'many', 'other' );
+ $forms = array( 'one', 'two', 'few', 'other' );
$this-assertEquals( $result, $this-getLang()-convertPlural(
$value, $forms ) );
}
function providePluralAllForms() {
return array(
- array( 'many', 0 ),
+ array( 'few', 0 ),
array( 'one', 1 ),
- array( 'few', 2 ),
+ array( 'two', 2 ),
array( 'other', 3 ),
- array( 'many', 10 ),
- array( 'many', 11 ),
- array( 'many', 12 ),
- array( 'many', 19 ),
+ array( 'few', 10 ),
+ array( 'few', 11 ),
+ array( 'few', 12 ),
+ array( 'few', 19 ),
array( 'other', 20 ),
- array( 'many', 100 ),
+ array( 'few', 100 ),
array( 'one', 101 ),
-
[MediaWiki-commits] [Gerrit] Toolbar icons for bold L and italic E - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Toolbar icons for bold L and italic E .. Toolbar icons for bold L and italic E Created by Wikimedia Commons user Inductiveload, using inkscape and a Gimp script that emulates the actions listed at https://usability.wikimedia.org/wiki/Babaco_Designs/Icon_Localization Files available under license Creative Commons Attribution 3.0 by https://commons.wikimedia.org/wiki/User:Inductiveload Original files: * https://commons.wikimedia.org/wiki/File:Toolbaricon_bold_L.png * https://commons.wikimedia.org/wiki/File:Toolbaricon_italic_E.png Change-Id: I86e69479ead45ab9b3b44ba4d599f8403b1abe4d --- A modules/images/toolbar/format-bold-L.png A modules/images/toolbar/format-italic-E.png 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved PleaseStand: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/images/toolbar/format-bold-L.png b/modules/images/toolbar/format-bold-L.png new file mode 100644 index 000..4819e67 --- /dev/null +++ b/modules/images/toolbar/format-bold-L.png Binary files differ diff --git a/modules/images/toolbar/format-italic-E.png b/modules/images/toolbar/format-italic-E.png new file mode 100644 index 000..181a09b --- /dev/null +++ b/modules/images/toolbar/format-italic-E.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/52710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86e69479ead45ab9b3b44ba4d599f8403b1abe4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Platonides platoni...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Platonides platoni...@gmail.com Gerrit-Reviewer: PleaseStand pleasest...@live.com Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache confs for nagios.* are no more needed - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54341 Change subject: apache confs for nagios.* are no more needed .. apache confs for nagios.* are no more needed We used to have two virtual hosts nagios.wikimedia.org and nagios3.wikimedia.org to expose our Nagios installation. We have since migrated to Icinga for which the virtual host configuration honor nagios.wikimedia.org requests: templates/apache/sites/icinga.wikimedia.org.erb nagios3.wikimedia.org seems to have been an experimentation before we took the decision to move to Icinga. Seems it is unneeded anymore. Change-Id: I6be9b96b009642a6c6a3d78e161ba91bb7ac8833 --- D files/apache/sites/nagios.wikimedia.org D files/apache/sites/nagios3.wikimedia.org 2 files changed, 0 insertions(+), 196 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/54341/1 diff --git a/files/apache/sites/nagios.wikimedia.org b/files/apache/sites/nagios.wikimedia.org deleted file mode 100644 index f2c943c..000 --- a/files/apache/sites/nagios.wikimedia.org +++ /dev/null @@ -1,98 +0,0 @@ -VirtualHost *:443 - ServerName nagios.wikimedia.org - ServerAlias spence.wikimedia.org - DocumentRoot /usr/local/nagios/share - ScriptAlias /nagios/cgi-bin /usr/local/nagios/sbin - ServerAdmin n...@wikimedia.org - - SSLEngine On - SSLCertificateFile /etc/ssl/private/star.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key - SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem - - Directory /usr/local/nagios/sbin - SSLRequireSSL - Options ExecCGI - AllowOverride None - Order allow,deny - Allow from all - # Order deny,allow - # Deny from all - # Allow from 127.0.0.1 - AuthName Nagios Access - AuthType Basic - AuthUserFile /usr/local/nagios/etc/htpasswd.users - Require valid-user - /Directory - - Directory /usr/local/nagios/share - SSLRequireSSL - Options FollowSymLinks - AllowOverride AuthConfig - Order allow,deny - Allow from all - # Order deny,allow - # Deny from all - # Allow from 127.0.0.1 - AuthName Nagios Access - AuthType Basic - AuthUserFile /usr/local/nagios/etc/htpasswd.users - Require valid-user - /Directory - - IfModule !mod_alias.c - LoadModule alias_module modules/mod_alias.so - /IfModule - - Alias /ninja /usr/local/nagios/addons/ninja - Directory /usr/local/nagios/addons/ninja - Order allow,deny - Allow from all - DirectoryIndex index.php - AuthName Nagios Access - AuthType Basic - AuthUserFile /usr/local/nagios/etc/htpasswd.users - Require valid-user - /Directory - - -/VirtualHost - -VirtualHost *:80 - ServerName nagios.wikimedia.org - ServerAlias spence.wikimedia.org - DocumentRoot /usr/local/nagios/share - ScriptAlias /nagios/cgi-bin /usr/local/nagios/sbin - ServerAdmin n...@wikimedia.org - - Directory /usr/local/nagios/sbin - # SSLRequireSSL - Options ExecCGI - AllowOverride None - Order allow,deny - Allow from all - # Order deny,allow - # Deny from all - # Allow from 127.0.0.1 - # AuthName Nagios Access - # AuthType Basic - # AuthUserFile /usr/local/nagios/etc/htpasswd.users - # Require valid-user - /Directory - - Directory /usr/local/nagios/share - # SSLRequireSSL - Options FollowSymLinks Indexes - AllowOverride AuthConfig - Order allow,deny - Allow from all - # Order deny,allow - # Deny from all - # Allow from 127.0.0.1 - # AuthName Nagios Access - # AuthType Basic - # AuthUserFile /usr/local/nagios/etc/htpasswd.users - # Require valid-user - /Directory - -/VirtualHost diff --git a/files/apache/sites/nagios3.wikimedia.org b/files/apache/sites/nagios3.wikimedia.org deleted file mode 100644 index 13ce619..000 --- a/files/apache/sites/nagios3.wikimedia.org +++ /dev/null @@ -1,98 +0,0 @@ -VirtualHost *:443 - ServerName nagios.wikimedia.org - ServerAlias neon.wikimedia.org - DocumentRoot /usr/local/nagios/share - ScriptAlias /nagios/cgi-bin /usr/local/nagios/sbin - ServerAdmin n...@wikimedia.org - -
[MediaWiki-commits] [Gerrit] Add Japanese translation - change (test...examples)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54342
Change subject: Add Japanese translation
..
Add Japanese translation
Change-Id: I5d9b411ca01b8290195bfcc92cfda2191414b1d5
---
M Parser_function.i18n.magic.php
M Parser_function.php
M Parser_hook.php
M SpecialIncludable.php
M Variable_hook.i18n.magic.php
5 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples
refs/changes/42/54342/1
diff --git a/Parser_function.i18n.magic.php b/Parser_function.i18n.magic.php
index dc5348e..171b780 100644
--- a/Parser_function.i18n.magic.php
+++ b/Parser_function.i18n.magic.php
@@ -14,6 +14,10 @@
'example' = array( 0, 'example' ),
);
+$magicWords['ja'] = array(
+ 'example' = array( 0, '例' ),
+);
+
$magicWords['nl'] = array(
'example' = array( 0, 'voorbeeld' ),
);
diff --git a/Parser_function.php b/Parser_function.php
index 40d5da6..d612d8c 100644
--- a/Parser_function.php
+++ b/Parser_function.php
@@ -22,7 +22,7 @@
function wfExampleParserFunction_Setup( $parser ) {
# Set a function hook associating the example magic word
-# with our function.
+ # with our function.
$parser-setFunctionHook( 'example', 'wfExampleParserFunction_Render' );
return true;
}
diff --git a/Parser_hook.php b/Parser_hook.php
index faf768b..ce51139 100644
--- a/Parser_hook.php
+++ b/Parser_hook.php
@@ -56,4 +56,3 @@
return 'pre' . $dataEscaped . \n . $paramsEscaped .
'/pre';
}
}
-
diff --git a/SpecialIncludable.php b/SpecialIncludable.php
index 9bb5edb..beb5fa1 100644
--- a/SpecialIncludable.php
+++ b/SpecialIncludable.php
@@ -27,8 +27,8 @@
class SpecialIncludable extends IncludableSpecialPage {
/**
- * Constructor
- */
+* Constructor
+*/
function __construct() {
parent::__construct( 'Includable' );
}
@@ -48,4 +48,4 @@
$wgOut-addWikiText( $out );
}
-}
\ No newline at end of file
+}
diff --git a/Variable_hook.i18n.magic.php b/Variable_hook.i18n.magic.php
index 08893f1..196d7ff 100644
--- a/Variable_hook.i18n.magic.php
+++ b/Variable_hook.i18n.magic.php
@@ -12,3 +12,7 @@
# elements are synonyms for our parser function.
'example' = array( 1, 'EXAMPLE' ),
);
+
+$magicWords['ja'] = array(
+ 'example' = array( 1, '例' ),
+);
--
To view, visit https://gerrit.wikimedia.org/r/54342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d9b411ca01b8290195bfcc92cfda2191414b1d5
Gerrit-PatchSet: 1
Gerrit-Project: test/mediawiki/extensions/examples
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45926) b/c for nagios URL - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54343 Change subject: (bug 45926) b/c for nagios URL .. (bug 45926) b/c for nagios URL * redirects nagios.wikimedia.org to icinga.wikimedia.org * rewrites the cgi-bin/nagios urls to cgi-bin/icinga Change-Id: I7b75496347d447818c77637326da0452838a851d --- M templates/apache/sites/icinga.wikimedia.org.erb 1 file changed, 32 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/54343/1 diff --git a/templates/apache/sites/icinga.wikimedia.org.erb b/templates/apache/sites/icinga.wikimedia.org.erb index b869f26..b4219cd 100644 --- a/templates/apache/sites/icinga.wikimedia.org.erb +++ b/templates/apache/sites/icinga.wikimedia.org.erb @@ -1,3 +1,5 @@ +# vim: filetype=apache + NameVirtualHost *:80 NameVirtualHost *:443 @@ -12,10 +14,39 @@ # Where the HTML pages live Alias /icinga /usr/share/icinga/htdocs + +VirtualHost *:443 + ServerName nagios.wikimedia.org + ServerAdmin n...@wikimedia.org + SSLEngine On + SSLCertificateFile /etc/ssl/private/star.wikimedia.org.pem + SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key + SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + + # Bug 45926 - keep back compatibility for nagios URLs + RewriteEngine on + # Rewrite the 'nagios' path under cgi-bin + RewriteRule ^/cgi-bin/nagios/(.*) https://icinga.wikimedia.org/cgi-bin/icinga/$1 [L,R=301] + # Wildcard redirect: + RewriteRule ^/(.*)$ https://icinga.wikimedia.org/$1 [R=301] +/VirtualHost + +VirtualHost *:80 + ServerName nagios.wikimedia.org + ServerAdmin n...@wikimedia.org + + # Bug 45926 - keep back compatibility for nagios URLs + RewriteEngine on + # Rewrite the 'nagios' path under cgi-bin + RewriteRule ^/cgi-bin/nagios/(.*) https://icinga.wikimedia.org/cgi-bin/icinga/$1 [L,R=301] + # Wildcard redirect: + RewriteRule ^/(.*)$ https://icinga.wikimedia.org/$1 [R=301] +/VirtualHost + + VirtualHost *:443 ServerName icinga.wikimedia.org ServerAlias neon.wikimedia.org - ServerAlias nagios.wikimedia.org ServerAdmin n...@wikimedia.org SSLEngine On SSLCertificateFile /etc/ssl/private/star.wikimedia.org.pem @@ -37,12 +68,10 @@ RedirectMatch ^/$ https://icinga.wikimedia.org/icinga ErrorLog /var/log/apache2/icinga.log LogLevel warn - /VirtualHost VirtualHost *:80 ServerName icinga.wikimedia.org - ServerAlias nagios.wikimedia.org ServerAlias neon.wikimedia.org ServerAdmin n...@wikimedia.org DocumentRoot /usr/share/icinga/htdocs @@ -87,7 +116,6 @@ RedirectMatch ^/$ https://icinga-admin.wikimedia.org/icinga ErrorLog /var/log/apache2/icinga.log LogLevel warn - /VirtualHost VirtualHost *:80 -- To view, visit https://gerrit.wikimedia.org/r/54343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b75496347d447818c77637326da0452838a851d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (hot fix) fix of two obvious mistakes in jQuery.wikibase.sna... - change (mediawiki...Wikibase)
Henning Snater has submitted this change and it was merged.
Change subject: (hot fix) fix of two obvious mistakes in
jQuery.wikibase.snaklistview
..
(hot fix) fix of two obvious mistakes in jQuery.wikibase.snaklistview
At least one of these would throw some exceptions during normal usage of the
new multi-snak
References feature.
* usage of undefined variable
* usage of this where self should be used.
* Also got rid of some pointless 'else' (since a return is used inside of the
if block)
- patch set 2: Removed code from wikibase.Entity.js which obviously does not
belong to
the change set.
Change-Id: I33f64c5b02073cb70cd71528596782bfe355df7b
---
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
2 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Henning Snater: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
index dc1183f..65d7227 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
@@ -171,7 +171,7 @@
.on( self._lia.prefixedEvent( 'stopediting' ),
function( event, dropValue, newSnak ) {
if (
- !self.isValid()
!this.isInitialValue()
+ !self.isValid()
!self.isInitialValue()
!dropValue
!self.__continueSnakviewStopEditing
) {
event.preventDefault();
@@ -387,25 +387,25 @@
* @return {wb.SnakList|null}
*/
value: function( snakList ) {
- if ( snakList ) {
- if ( !( value instanceof wb.SnakList ) ) {
+ if ( snakList ) { // setter:
+ if ( !( snakList instanceof wb.SnakList ) ) {
throw new Error( 'Value has to be an instance
of wikibase.SnakList' );
}
this._snakList = snakList;
return this._snakList;
- } else {
- var self = this,
- snaks = [];
-
- $.each( this._listview.items(), function( i, item ) {
- var liInstance = self._lia.liInstance( $( item
) );
- if ( liInstance.snak() ) {
- snaks.push( liInstance.snak() );
- }
- } );
-
- return ( snaks.length 0 ) ? new wb.SnakList( snaks ):
null;
}
+ // getter:
+ var self = this,
+ snaks = [];
+
+ $.each( this._listview.items(), function( i, item ) {
+ var liInstance = self._lia.liInstance( $( item ) );
+ if ( liInstance.snak() ) {
+ snaks.push( liInstance.snak() );
+ }
+ } );
+
+ return ( snaks.length 0 ) ? new wb.SnakList( snaks ): null;
},
/**
diff --git
a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
index 5c5ec74..58fb00f 100644
--- a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
+++ b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
@@ -414,6 +414,6 @@
throw new Error( 'Unkown entity type ' + type + '' );
}
return entity;
- }
+ };
}( wikibase, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/54313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33f64c5b02073cb70cd71528596782bfe355df7b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve type hints - change (mediawiki...DataValues)
John Erling Blad has submitted this change and it was merged.
Change subject: Improve type hints
..
Improve type hints
Change-Id: I05ba765ca721877292bf2e3125ec8e42a95876ac
---
M DataValues/includes/values/BooleanValue.php
M DataValues/includes/values/GeoCoordinateValue.php
M DataValues/includes/values/IriValue.php
M DataValues/includes/values/MediaWikiTitleValue.php
M DataValues/includes/values/MonolingualTextValue.php
M DataValues/includes/values/MultilingualTextValue.php
M DataValues/includes/values/NumberValue.php
M DataValues/includes/values/PropertyValue.php
M DataValues/includes/values/QuantityValue.php
M DataValues/includes/values/StringValue.php
M DataValues/includes/values/TimeValue.php
M DataValues/includes/values/UnknownValue.php
12 files changed, 28 insertions(+), 14 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/DataValues/includes/values/BooleanValue.php
b/DataValues/includes/values/BooleanValue.php
index f01b03b..2fe4dc5 100644
--- a/DataValues/includes/values/BooleanValue.php
+++ b/DataValues/includes/values/BooleanValue.php
@@ -1,6 +1,7 @@
?php
namespace DataValues;
+
use InvalidArgumentException;
/**
@@ -121,7 +122,7 @@
*
* @param mixed $data
*
-* @return DataValue
+* @return BooleanValue
*/
public static function newFromArray( $data ) {
return new static( $data );
diff --git a/DataValues/includes/values/GeoCoordinateValue.php
b/DataValues/includes/values/GeoCoordinateValue.php
index 0d10a0a..3edf645 100644
--- a/DataValues/includes/values/GeoCoordinateValue.php
+++ b/DataValues/includes/values/GeoCoordinateValue.php
@@ -1,6 +1,7 @@
?php
namespace DataValues;
+
use InvalidArgumentException;
/**
@@ -267,7 +268,7 @@
*
* @param array $data
*
-* @return DataValue
+* @return GeoCoordinateValue
*/
public static function newFromArray( array $data ) {
return new static( $data['latitude'], $data['longitude'],
$data['altitude'], $data['globe'] );
diff --git a/DataValues/includes/values/IriValue.php
b/DataValues/includes/values/IriValue.php
index 42b2bdb..bfe 100644
--- a/DataValues/includes/values/IriValue.php
+++ b/DataValues/includes/values/IriValue.php
@@ -1,6 +1,7 @@
?php
namespace DataValues;
+
use InvalidArgumentException;
/**
@@ -281,7 +282,7 @@
*
* @param array $data
*
-* @return DataValue
+* @return IriValue
*/
public static function newFromArray( array $data ) {
return new static( $data['scheme'], $data['hierarchicalpart'],
$data['query'], $data['fragment'] );
diff --git a/DataValues/includes/values/MediaWikiTitleValue.php
b/DataValues/includes/values/MediaWikiTitleValue.php
index fa3db92..8494fe9 100644
--- a/DataValues/includes/values/MediaWikiTitleValue.php
+++ b/DataValues/includes/values/MediaWikiTitleValue.php
@@ -1,7 +1,9 @@
?php
namespace DataValues;
-use InvalidArgumentException, Title;
+
+use InvalidArgumentException;
+use Title;
/**
* Class representing a MediaWiki title value.
@@ -117,7 +119,7 @@
*
* @param mixed $data
*
-* @return DataValue
+* @return MediaWikiTitleValue
*/
public static function newFromArray( $data ) {
return new static( $data );
diff --git a/DataValues/includes/values/MonolingualTextValue.php
b/DataValues/includes/values/MonolingualTextValue.php
index 36d72c7..621a1d3 100644
--- a/DataValues/includes/values/MonolingualTextValue.php
+++ b/DataValues/includes/values/MonolingualTextValue.php
@@ -1,6 +1,7 @@
?php
namespace DataValues;
+
use InvalidArgumentException;
/**
@@ -178,7 +179,7 @@
*
* @param array $data
*
-* @return DataValue
+* @return MonolingualTextValue
*/
public static function newFromArray( array $data ) {
return new static( $data['language'], $data['text'] );
diff --git a/DataValues/includes/values/MultilingualTextValue.php
b/DataValues/includes/values/MultilingualTextValue.php
index 81e2d3c..94be497 100644
--- a/DataValues/includes/values/MultilingualTextValue.php
+++ b/DataValues/includes/values/MultilingualTextValue.php
@@ -1,6 +1,7 @@
?php
namespace DataValues;
+
use InvalidArgumentException;
/**
@@ -162,7 +163,7 @@
*
* @param array $data
*
-* @return DataValue
+* @return MultilingualTextValue
*/
public static function newFromArray( array $data ) {
$values = array();
diff --git a/DataValues/includes/values/NumberValue.php
b/DataValues/includes/values/NumberValue.php
index 815adcb..b640f1b 100644
--- a/DataValues/includes/values/NumberValue.php
+++
[MediaWiki-commits] [Gerrit] Update install requirements - change (mediawiki...Ask)
John Erling Blad has submitted this change and it was merged. Change subject: Update install requirements .. Update install requirements Change-Id: I91fdb69314d50ef56a569ad1ebef7188f39939ff --- M INSTALL 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Erling Blad: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/INSTALL b/INSTALL index cf06458..98d9468 100644 --- a/INSTALL +++ b/INSTALL @@ -9,6 +9,7 @@ Ask requires: * PHP 5.3 or above +* DataValues library 0.1 or above * If used as MediaWiki extension: MediaWiki 1.16 or later ** PHPUnit tests can require the latest MediaWiki -- To view, visit https://gerrit.wikimedia.org/r/54018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91fdb69314d50ef56a569ad1ebef7188f39939ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Ask Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de Gerrit-Reviewer: John Erling Blad john.b...@wikimedia.de 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 file to clarify DataModel component dependencies - change (mediawiki...Wikibase)
John Erling Blad has submitted this change and it was merged. Change subject: Added file to clarify DataModel component dependencies .. Added file to clarify DataModel component dependencies Change-Id: Ia980d7bb7aa8d91538b1eb171e23a8f1413cbf45 --- A DataModel/dependencies.txt 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: John Erling Blad: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/DataModel/dependencies.txt b/DataModel/dependencies.txt new file mode 100644 index 000..bb0fc3e --- /dev/null +++ b/DataModel/dependencies.txt @@ -0,0 +1,8 @@ +The Wikibase DataModel component is dependent on: + +* WikibaseLib (this dependency is something we want to get rid of) +* MediaWiki (this dependency is something we want to get rid of) +* DataValues library +* Ask library (only the Query class has this dependency) + +And nothing else. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/54017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia980d7bb7aa8d91538b1eb171e23a8f1413cbf45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de Gerrit-Reviewer: John Erling Blad john.b...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de 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 array with watchlist options to SpecialWatchlistQuery - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add array with watchlist options to SpecialWatchlistQuery .. Add array with watchlist options to SpecialWatchlistQuery This data is very useful with the hook as it holds the criteria to build the watchlist query. Change-Id: I688ab0b35b301f180bbfde3ad3043b1ee602de10 --- M docs/hooks.txt M includes/specials/SpecialWatchlist.php 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: IAlex: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/hooks.txt b/docs/hooks.txt index 3670cbe..c266dcc 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2272,6 +2272,7 @@ $tables: array of tables to be queried $join_conds: join conditions for the tables $fields: array of query fields +$values: array of variables with watchlist options 'TestCanonicalRedirect': Called when about to force a redirect to a canonical URL for a title when we have no other parameters on the URL. Gives a chance for diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index f52c9a7..c7f122b 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -293,7 +293,7 @@ } ChangeTags::modifyDisplayQuery( $tables, $fields, $conds, $join_conds, $options, '' ); - wfRunHooks( 'SpecialWatchlistQuery', array( $conds, $tables, $join_conds, $fields ) ); + wfRunHooks( 'SpecialWatchlistQuery', array( $conds, $tables, $join_conds, $fields, $values ) ); $res = $dbr-select( $tables, $fields, $conds, __METHOD__, $options, $join_conds ); $numRows = $res-numRows(); -- To view, visit https://gerrit.wikimedia.org/r/54145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I688ab0b35b301f180bbfde3ad3043b1ee602de10 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: IAlex ialex.w...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjusted load balancer settings on Wikidata test repos. - change (operations/puppet)
Silke Meyer has uploaded a new change for review. https://gerrit.wikimedia.org/r/54344 Change subject: Adjusted load balancer settings on Wikidata test repos. .. Adjusted load balancer settings on Wikidata test repos. Change-Id: I1a4b2c4f2e1e4ee455be786fb7e080fc140821f9 --- M modules/wikidata_singlenode/templates/wikidata-repo-requires.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/44/54344/1 diff --git a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php index 286c497..baa60a6 100644 --- a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php +++ b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php @@ -134,7 +134,7 @@ // Configure two sections, one for the repo and one for the client. // Each section contains only one server. 'sectionLoads' = array( - 'repo' = array( + 'DEFAULT' = array( 'localhost' = 1, ), 'client' = array( @@ -145,7 +145,7 @@ // Map the wiki database names to sections. Database names must be unique, // i.e. may not exist in more than one section. 'sectionsByDB' = array( - $wgDBname = 'repo', + $wgDBname = 'DEFAULT', 'client' = 'client', ), -- To view, visit https://gerrit.wikimedia.org/r/54344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a4b2c4f2e1e4ee455be786fb7e080fc140821f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Silke Meyer silke.me...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add comments for grep (includes/installer/) - change (mediawiki/core)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54346
Change subject: Add comments for grep (includes/installer/)
..
Add comments for grep (includes/installer/)
Change-Id: Idb44b343267978ae214b2cfe9a05947b220629d7
---
M includes/installer/DatabaseInstaller.php
M includes/installer/Installer.php
M includes/installer/MysqlInstaller.php
M includes/installer/WebInstallerPage.php
4 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/54346/1
diff --git a/includes/installer/DatabaseInstaller.php
b/includes/installer/DatabaseInstaller.php
index 3472b7f..8231e7f 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -335,6 +335,8 @@
* @return String
*/
public function getReadableName() {
+ // Give grep a chance to find the usages:
+ // config-type-mysql, config-type-postgres, config-type-sqlite,
config-type-oracle
return wfMessage( 'config-type-' . $this-getName() )-text();
}
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 4d8e5f0..e854786 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -643,6 +643,8 @@
$allNames = array();
+ // Give grep a chance to find the usages:
+ // onfig-type-mysql, config-type-postgres, config-type-oracle,
config-type-sqlite
foreach ( self::getDBTypes() as $name ) {
$allNames[] = wfMessage( config-type-$name )-text();
}
diff --git a/includes/installer/MysqlInstaller.php
b/includes/installer/MysqlInstaller.php
index f9a8ce7..a3a8d0b 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -361,6 +361,7 @@
}
if ( count( $engines ) = 2 ) {
+ // Give grep a chance to find the usages:
config-mysql-innodb, config-mysql-myisam
$s .= $this-getRadioSet( array(
'var' = '_MysqlEngine',
'label' = 'config-mysql-engine',
@@ -385,6 +386,7 @@
// Do charset selector
if ( count( $charsets ) = 2 ) {
+ // Give grep a chance to find the usages:
config-mysql-binary, config-mysql-utf8
$s .= $this-getRadioSet( array(
'var' = '_MysqlCharset',
'label' = 'config-mysql-charset',
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index f352cf1..9344645 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -84,12 +84,14 @@
if ( $continue ) {
// Fake submit button for enter keypress (bug 26267)
+ // Give grep a chance to find the usages:
config-continue
$s .= Xml::submitButton( wfMessage( config-$continue
)-text(),
array( 'name' = enter-$continue, 'style' =
'visibility:hidden;overflow:hidden;width:1px;margin:0' ) ) . \n;
}
if ( $back ) {
+ // Give grep a chance to find the usages: config-back
$s .= Xml::submitButton( wfMessage( config-$back
)-text(),
array(
'name' = submit-$back,
@@ -98,6 +100,7 @@
}
if ( $continue ) {
+ // Give grep a chance to find the usages:
config-continue
$s .= Xml::submitButton( wfMessage( config-$continue
)-text(),
array(
'name' = submit-$continue,
@@ -452,6 +455,8 @@
$settings = '';
$defaultType = $this-getVar( 'wgDBtype' );
+ // Give grep a chance to find the usages:
+ // config-support-mysql, config-support-postgres,
config-support-oracle, config-support-sqlite
$dbSupport = '';
foreach( $this-parent-getDBTypes() as $type ) {
$link = DatabaseBase::factory( $type
)-getSoftwareLink();
@@ -474,6 +479,8 @@
) .
/li\n;
+ // Give grep a chance to find the usages:
+ // config-header-mysql, config-header-postgres,
config-header-oracle, config-header-sqlite
$settings .=
Html::openElement( 'div', array( 'id' =
'DB_wrapper_' . $type,
[MediaWiki-commits] [Gerrit] Initializing referenceview add toolbar via toolbar controller - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54347
Change subject: Initializing referenceview add toolbar via toolbar controller
..
Initializing referenceview add toolbar via toolbar controller
The add toolbar for adding a new snak to a reference makes use of the toolbar
controller now. A toolbar definition accepts custom event now - added some more
detailed documentation regarding toolbar definitions.
Change-Id: Ic3806552f0c1057bbaf32dbebc9df99975b19485
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M
lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
M
lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.js
M repo/resources/wikibase.ui.entityViewInit.js
4 files changed, 113 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/47/54347/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index d24637a..e01db39 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -47,28 +47,6 @@
}
PARENT.prototype._create.call( this );
this._updateReferenceHashClass( this.value() );
-
- // TODO: Make use of toolbar controller
- this.element
- .on( 'referenceviewstartediting', function( event, dropValue ) {
- // Append add toolbar to add new snaks:
- self.$addToolbar = mw.template( 'wb-toolbar', ''
).appendTo( self.element );
- self.element.addtoolbar( {
- toolbarParentSelector: ' .wb-ui-toolbar',
- customAction: function( event, $parent ) {
- self.enterNewItem();
- },
- eventPrefix:
$.wikibase.referenceview.prototype.widgetEventPrefix
- } );
- } )
- .on( 'referenceviewafterstopediting', function( event,
dropValue ) {
- self.element.data( 'addtoolbar' ).destroy();
- self.$addToolbar.remove();
- } )
- .on( 'referenceviewchange', function( event ) {
- var toolbar = self.element.data( 'addtoolbar' ).toolbar;
- toolbar[self.isValid() ? 'enable' : 'disable']();
- } );
},
/**
@@ -169,4 +147,28 @@
}
} );
+$.wikibase.toolbarcontroller.definition( 'addtoolbar', {
+ id: 'referenceview-snakview',
+ selector: '.wb-statement-references .wb-referenceview',
+ eventPrefix: 'referenceview',
+ events: {
+ startediting: 'create',
+ afterstopediting: 'destroy',
+ change: function( event ) {
+ var referenceView = $( event.target ).data(
'referenceview' ),
+ addToolbar = $( event.target ).data(
'addtoolbar' );
+ if ( toolbar ) {
+ addToolbar.toolbar[referenceView.isValid() ?
'enable' : 'disable']();
+ }
+ }
+ },
+ options: {
+ toolbarParentSelector: ' .wb-ui-toolbar',
+ customAction: function( event, $parent ) {
+ self.enterNewItem();
+ },
+ eventPrefix:
$.wikibase.referenceview.prototype.widgetEventPrefix
+ }
+} );
+
}( mediaWiki, wikibase, jQuery ) );
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
b/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
index 61d3f69..ed2f8a9 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
@@ -60,6 +60,56 @@
* @param {string} type The toolbar type (see options for available
types)
* @param {Object} toolbarDefinitionOrId Object defining a toolbar that
should be set or a
*toolbar id/widget name to get a registered toolbar definition.
+*A toolbar definition may contain the following attributes:
+*- widget
+* An object referencing the widget the toolbar shall interact
with, for example:
+* { name: 'wikibase.claimlistview', prototype:
$.wikibase.claimlistview.prototype }
+* Having defined an interaction widget, no other attributes
[MediaWiki-commits] [Gerrit] Adding wfLogWarning for production warnings. - change (mediawiki/core)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54348
Change subject: Adding wfLogWarning for production warnings.
..
Adding wfLogWarning for production warnings.
Change-Id: I531b7ceec089978c2832721486f277fdfca65270
---
M includes/GlobalFunctions.php
M includes/debug/Debug.php
2 files changed, 41 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/54348/1
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 99f5eb5..6be8def 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1093,16 +1093,29 @@
/**
* Send a warning either to the debug log or in a PHP error depending on
- * $wgDevelopmentWarnings
+ * $wgDevelopmentWarnings. To log warnings in production, use wfLogWarning()
instead.
*
* @param $msg String: message to send
* @param $callerOffset Integer: number of items to go back in the backtrace to
*find the correct caller (1 = function calling wfWarn, ...)
- * @param $level Integer: PHP error level; only used when
$wgDevelopmentWarnings
- *is true
+ * @param $level Integer: PHP error level; defaults to E_USER_NOTICE;
+ *only used when $wgDevelopmentWarnings is true
*/
function wfWarn( $msg, $callerOffset = 1, $level = E_USER_NOTICE ) {
- MWDebug::warning( $msg, $callerOffset + 1, $level );
+ MWDebug::warning( $msg, $callerOffset + 1, $level, 'auto' );
+}
+
+/**
+ * Send a warning as a PHP error and the debug log. This is intended for
logging
+ * warnings in production. For logging development warnings, use WfWarn
instead.
+ *
+ * @param $msg String: message to send
+ * @param $callerOffset Integer: number of items to go back in the backtrace to
+ *find the correct caller (1 = function calling wfLogWarning, ...)
+ * @param $level Integer: PHP error level; defaults to E_USER_WARNING
+ */
+function wfLogWarning( $msg, $callerOffset = 1, $level = E_USER_WARNING ) {
+ MWDebug::warning( $msg, $callerOffset + 1, $level, 'production' );
}
/**
@@ -2578,8 +2591,7 @@
if( !$ok ) {
// PHP doesn't report the path in its warning message, so add
our own to aid in diagnosis.
- trigger_error( sprintf( %s: failed to mkdir \%s\ mode 0%o,
__FUNCTION__, $dir, $mode ),
- E_USER_WARNING );
+ wfLogWarning( sprintf( failed to mkdir \%s\ mode 0%o, $dir,
$mode ) );
}
return $ok;
}
diff --git a/includes/debug/Debug.php b/includes/debug/Debug.php
index 8c60eca..6716d8b 100644
--- a/includes/debug/Debug.php
+++ b/includes/debug/Debug.php
@@ -136,9 +136,23 @@
* @param $msg string
* @param $callerOffset int
* @param $level int A PHP error level. See sendWarning()
+* @param $log string: 'production' will always trigger a php error,
'auto'
+*will trigger an error if $wgDevelopmentWarnings is true, and
'debug'
+*will only write to the debug log(s).
+*
* @return mixed
*/
- public static function warning( $msg, $callerOffset = 1, $level =
E_USER_NOTICE ) {
+ public static function warning( $msg, $callerOffset = 1, $level =
E_USER_NOTICE, $log = 'auto' ) {
+ global $wgDevelopmentWarnings;
+
+ if ( $log === 'auto' !$wgDevelopmentWarnings ) {
+ $log = 'debug';
+ }
+
+ if ( $log === 'debug' ) {
+ $level = false;
+ }
+
$callerDescription = self::getCallerDescription( $callerOffset
);
self::sendWarning( $msg, $callerDescription, $level );
@@ -212,7 +226,8 @@
}
if ( $sendToLog ) {
- self::sendWarning( $msg, $callerDescription,
E_USER_DEPRECATED );
+ global $wgDevelopmentWarnings; // we could have a more
specific $wgDeprecationWarnings setting.
+ self::sendWarning( $msg, $callerDescription,
$wgDevelopmentWarnings ? E_USER_DEPRECATED : false );
}
if ( self::$enabled ) {
@@ -267,23 +282,21 @@
}
/**
-* Send a warning either to the debug log or by triggering an user PHP
-* error depending on $wgDevelopmentWarnings.
+* Send a warning to the debug log and optionally also trigger a PHP
+* error, depending on the $level argument.
*
* @param $msg string Message to send
* @param $caller array caller description get from
getCallerDescription()
-* @param $level error level to use if $wgDevelopmentWarnings is true
+* @param $level int|bool error level to use; set to false to not
trigger an error
*/
private static function sendWarning( $msg, $caller, $level ) {
-
[MediaWiki-commits] [Gerrit] integrate tests with MediaWiki - change (mediawiki...AntiSpoof)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54349
Change subject: integrate tests with MediaWiki
..
integrate tests with MediaWiki
The PHPUnit test suite needs to be based on our class MediaWikiTestCase
or our phpunit.php wrapper will not find them. That also take care of
setting up $IP and autoloading.
Change-Id: I0ee5fb791415d23255af6bb946f6f49b818ce20a
---
M SpoofTest.php
1 file changed, 1 insertion(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof
refs/changes/49/54349/1
diff --git a/SpoofTest.php b/SpoofTest.php
index fc61331..3bc3bba 100644
--- a/SpoofTest.php
+++ b/SpoofTest.php
@@ -1,22 +1,7 @@
?php
-$IP = getenv( 'MW_INSTALL_PATH' );
-if ( !$IP ) {
- if ( file_exists( ../../includes/DefaultSettings.php ) ) {
- $IP = '../..';
- } elseif ( file_exists( ../../phase3/includes/DefaultSettings.php ) )
{
- $IP = '../../phase3';
- } else {
- die( 'Please set MW_INSTALL_PATH' );
- }
-}
+class TestSpoof extends MediaWikiTestCase {
-require_once( $IP/includes/AutoLoader.php );
-require_once( $IP/includes/normal/UtfNormalUtil.php );
-require_once( __DIR__ . '/SpoofUser.php' );
-require_once( __DIR__ . '/AntiSpoof_body.php' );
-
-class TestSpoof extends PHPUnit_Framework_TestCase {
public function providePositives() {
return array(
array( 'Laura Fiorucci', 'Låura Fiorucci' ),
--
To view, visit https://gerrit.wikimedia.org/r/54349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ee5fb791415d23255af6bb946f6f49b818ce20a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove custom plurals for Nso and Sl in favour of CLDR - change (mediawiki/core)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54350
Change subject: Remove custom plurals for Nso and Sl in favour of CLDR
..
Remove custom plurals for Nso and Sl in favour of CLDR
Nso - Northern Sotho
Sl - Slovenian
Change-Id: I0e0c84352de2de8f58af5a9147ba18b0fe1fb39a
---
D languages/classes/LanguageNso.php
M languages/classes/LanguageSl.php
M tests/phpunit/languages/LanguageSlTest.php
3 files changed, 2 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/54350/1
diff --git a/languages/classes/LanguageNso.php
b/languages/classes/LanguageNso.php
deleted file mode 100644
index 0c08675..000
--- a/languages/classes/LanguageNso.php
+++ /dev/null
@@ -1,44 +0,0 @@
-?php
-/**
- * Northern Sotho (Sesotho sa Leboa) specific code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Language
- */
-
-/**
- * Northern Sotho (Sesotho sa Leboa)
- *
- * @ingroup Language
- */
-class LanguageNso extends Language {
- /**
-* Use singular form for zero
-*
-* @param $count int
-* @param $forms array
-*
-* @return string
-*/
- function convertPlural( $count, $forms ) {
- if ( !count( $forms ) ) { return ''; }
- $forms = $this-preConvertPlural( $forms, 2 );
-
- return ( $count = 1 ) ? $forms[0] : $forms[1];
- }
-}
diff --git a/languages/classes/LanguageSl.php b/languages/classes/LanguageSl.php
index c075e51..77957b2 100644
--- a/languages/classes/LanguageSl.php
+++ b/languages/classes/LanguageSl.php
@@ -53,27 +53,4 @@
return $word; # this will return the original value for
'imenovalnik' (nominativ) and all undefined case values
}
- /**
-* @param $count int
-* @param $forms array
-*
-* @return string
-*/
- function convertPlural( $count, $forms ) {
- if ( !count( $forms ) ) { return ''; }
- $forms = $this-preConvertPlural( $forms, 5 );
-
- if ( $count % 100 == 1 ) {
- $index = 0;
- } elseif ( $count % 100 == 2 ) {
- $index = 1;
- } elseif ( $count % 100 == 3 || $count % 100 == 4 ) {
- $index = 2;
- } elseif ( $count != 0 ) {
- $index = 3;
- } else {
- $index = 4;
- }
- return $forms[$index];
- }
}
diff --git a/tests/phpunit/languages/LanguageSlTest.php
b/tests/phpunit/languages/LanguageSlTest.php
index 075e6af..96c370f 100644
--- a/tests/phpunit/languages/LanguageSlTest.php
+++ b/tests/phpunit/languages/LanguageSlTest.php
@@ -11,13 +11,13 @@
/** @dataProvider providerPlural */
function testPlural( $result, $value ) {
- $forms = array( 'one', 'two', 'few', 'other', 'zero' );
+ $forms = array( 'one', 'two', 'few', 'other' );
$this-assertEquals( $result, $this-getLang()-convertPlural(
$value, $forms ) );
}
function providerPlural() {
return array(
- array( 'zero', 0 ),
+ array( 'other', 0 ),
array( 'one', 1 ),
array( 'two', 2 ),
array( 'few', 3 ),
--
To view, visit https://gerrit.wikimedia.org/r/54350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e0c84352de2de8f58af5a9147ba18b0fe1fb39a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Finally make wbclient.linkItem non-experimental - change (mediawiki...Wikibase)
John Erling Blad has submitted this change and it was merged.
Change subject: Finally make wbclient.linkItem non-experimental
..
Finally make wbclient.linkItem non-experimental
Patchset 2: Rebased
Patchset 3: Sporious lines commented out
Change-Id: Ibcab6cfd32bbff82900fcc05edeedc63635fbd71
---
M client/WikibaseClient.hooks.php
M client/config/WikibaseClient.experimental.php
2 files changed, 8 insertions(+), 16 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index c466e25..1396a58 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -609,6 +609,8 @@
// Needed as we can't do that in the regular
CSS nor in JavaScript
// (as that only runs after the element
initially appeared).
$out-addModules( 'wikibase.client.nolanglinks'
);
+ // Add the JavaScript to link pages locally
+ $out-addModules( 'wbclient.linkItem' );
}
}
diff --git a/client/config/WikibaseClient.experimental.php
b/client/config/WikibaseClient.experimental.php
index e3844c3..4646a00 100644
--- a/client/config/WikibaseClient.experimental.php
+++ b/client/config/WikibaseClient.experimental.php
@@ -36,19 +36,9 @@
// includes/parserhooks
$wgAutoloadClasses['Wikibase\PropertyParserFunction'] = $dir .
'includes/parserhooks/PropertyParserFunction.php';
-// Add the JavaScript to link items locally
-$wgHooks['BeforePageDisplay'][] = function( OutputPage $out, Skin $skin ) {
- $title = $out-getTitle();
- $namespaceChecker = new \Wikibase\NamespaceChecker(
- \Wikibase\Settings::get( 'excludeNamespaces' ),
- \Wikibase\Settings::get( 'namespaces' )
- );
-
- if ( $namespaceChecker-isWikibaseEnabled( $title-getNamespace() ) ) {
- if ( !$out-getLanguageLinks() \Action::getActionName(
$skin-getContext() ) === 'view' $title-exists() ) {
- $out-addModules( 'wbclient.linkItem' );
- }
- }
-
- return true;
-};
+// Sporious code from a merge conflict, but should probably be left in due to
line above
+//$wgHooks['ParserFirstCallInit'][] = function( \Parser $parser ) {
+// $parser-setFunctionHook( 'property', array(
'\Wikibase\PropertyParserFunction', 'render' ) );
+//
+// return true;
+//};
--
To view, visit https://gerrit.wikimedia.org/r/53606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcab6cfd32bbff82900fcc05edeedc63635fbd71
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: John Erling Blad john.b...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 46110) - [TUX] Delay the proofread tooltip - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54351
Change subject: (Bug 46110) - [TUX] Delay the proofread tooltip
..
(Bug 46110) - [TUX] Delay the proofread tooltip
2 seconds delay.
Change-Id: I24e8761a1701e2496d3a64b9f472003ff1f1e24f
---
M resources/js/ext.translate.proofread.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/51/54351/1
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index b62c5ac..c64ccc4 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -158,7 +158,7 @@
.addClass(
'tux-proofread-action ' +
this.message.properties.status + ' ' + (proofreadBySelf ? 'accepted' : '' )
)
- .tipsy( { gravity: 's' } );
+ .tipsy( { gravity: 's', delayIn: 2000 } );
$proofreadEdit = $( 'div' )
.attr( 'title', mw.msg(
'tux-proofread-edit-tooltip' ) )
--
To view, visit https://gerrit.wikimedia.org/r/54351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24e8761a1701e2496d3a64b9f472003ff1f1e24f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) selenium tests for multiline references - change (mediawiki...Wikibase)
Henning Snater has submitted this change and it was merged. Change subject: (testing) selenium tests for multiline references .. (testing) selenium tests for multiline references - adding, editing, removing Change-Id: Id55e2f723bfae2b620b3e3b0e95ce51abd700d17 --- M repo/tests/selenium/statements/references_spec.rb M selenium/lib/modules/entity_selector_module.rb M selenium/lib/modules/reference_module.rb 3 files changed, 255 insertions(+), 29 deletions(-) Approvals: Henning Snater: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/repo/tests/selenium/statements/references_spec.rb b/repo/tests/selenium/statements/references_spec.rb index ab07bef..630ddd6 100644 --- a/repo/tests/selenium/statements/references_spec.rb +++ b/repo/tests/selenium/statements/references_spec.rb @@ -38,7 +38,9 @@ cm_statement_value = Louisiana 462.svg cm_reference_value = Lousiana Red Kammgarn.jpg +cm_reference_value2 = Nyan.jpg cm_reference_value_changed = Denkmal.png +cm_reference_value_changed2 = Dynamite-5.svg describe Check references UI do before :all do @@ -69,42 +71,94 @@ page.wait_for_entity_to_load page.referenceContainer?.should be_true page.referenceHeading?.should be_true +page.referenceEditHeading?.should be_false page.addReferenceToFirstClaim?.should be_true + page.addReferenceToFirstClaim +page.referenceEditHeading?.should be_true page.addReferenceToFirstClaim?.should be_false page.saveReference?.should be_false page.removeReference?.should be_false page.cancelReference?.should be_true +page.addReferenceLine?.should be_false +page.entitySelectorInput?.should be_true +page.removeReferenceLine1?.should be_false page.cancelReference + page.addReferenceToFirstClaim?.should be_true +page.referenceEditHeading?.should be_false page.saveReference?.should be_false page.removeReference?.should be_false page.cancelReference?.should be_false +page.addReferenceLine?.should be_false +page.removeReferenceLine1?.should be_false +page.entitySelectorInput?.should be_false page.addReferenceToFirstClaim page.saveReference?.should be_false page.entitySelectorInput = generate_random_string(10) page.saveReference?.should be_false +page.referenceValueInput?.should be_false +page.addReferenceLine?.should be_false +page.removeReferenceLine1?.should be_false + page.entitySelectorInput_element.clear page.entitySelectorInput = properties_cm[1][label] ajax_wait page.wait_for_reference_value_box -page.referenceValueInput.should be_true +page.referenceValueInput?.should be_true page.saveReference?.should be_false page.cancelReference?.should be_true page.removeReference?.should be_false -page.referenceValueInput = generate_random_string(10) +page.addReferenceLine?.should be_false +page.removeReferenceLine1?.should be_false +random_ref_value = generate_random_string(10) +page.referenceValueInput = random_ref_value page.saveReference?.should be_true page.cancelReference?.should be_true +page.addReferenceLine?.should be_true +page.removeReferenceLine1?.should be_false +page.addReferenceLine +page.removeReferenceLine1?.should be_true +page.removeReferenceLine2?.should be_true +page.addReferenceLine?.should be_false +page.saveReference?.should be_false +page.removeReferenceLine2 +page.removeReferenceLine1?.should be_false +page.removeReferenceLine2?.should be_false +page.addReferenceLine?.should be_true +page.saveReference?.should be_true +page.entitySelectorInput?.should be_true +page.referenceValueInput?.should be_true +page.entitySelectorInput.should == properties_cm[1][label] +page.referenceValueInput.should == random_ref_value + page.entitySelectorInput_element.clear page.entitySelectorInput = -# TODO: this will fail because of bug 44543 -# page.saveReference?.should be_false +page.saveReference?.should be_false +page.addReferenceLine?.should be_false +page.removeReferenceLine1?.should be_false page.referenceValueInput?.should be_false page.entitySelectorInput = properties_cm[1][label] ajax_wait page.wait_for_reference_value_box +page.referenceValueInput_element.clear page.referenceValueInput = generate_random_string(10) page.saveReference?.should be_true +page.addReferenceLine?.should be_true +page.cancelReference?.should be_true +page.removeReferenceLine1?.should be_false + +
[MediaWiki-commits] [Gerrit] (Bug 46110) - [TUX] Delay the proofread tooltip - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 46110) - [TUX] Delay the proofread tooltip
..
(Bug 46110) - [TUX] Delay the proofread tooltip
2 seconds delay.
Change-Id: I24e8761a1701e2496d3a64b9f472003ff1f1e24f
---
M resources/js/ext.translate.proofread.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Pginer: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index b62c5ac..c64ccc4 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -158,7 +158,7 @@
.addClass(
'tux-proofread-action ' +
this.message.properties.status + ' ' + (proofreadBySelf ? 'accepted' : '' )
)
- .tipsy( { gravity: 's' } );
+ .tipsy( { gravity: 's', delayIn: 2000 } );
$proofreadEdit = $( 'div' )
.attr( 'title', mw.msg(
'tux-proofread-edit-tooltip' ) )
--
To view, visit https://gerrit.wikimedia.org/r/54351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24e8761a1701e2496d3a64b9f472003ff1f1e24f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45968) Set $wgCategoryCollation to 'uca-pl' on Polish W... - change (operations/mediawiki-config)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54352 Change subject: (bug 45968) Set $wgCategoryCollation to 'uca-pl' on Polish Wikivoyage .. (bug 45968) Set $wgCategoryCollation to 'uca-pl' on Polish Wikivoyage Change-Id: Ic40ee9ec908c8398d33ee6a6211e6c3c2b1e7eb3 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/52/54352/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b5b9a4f..b37cdff 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10301,6 +10301,7 @@ // Single-language wikis 'iswiktionary' = 'identity', // bug 30722 'plwiki' = 'uca-pl', // bug 42413 + 'plwikivoyage' = 'uca-pl', // bug 45968 'ptwiki' = 'uca-pt', // bug 45911 'ptwikibooks' = 'uca-pt', // bug 45911 'svwiki' = 'uca-sv', // bug 45446 -- To view, visit https://gerrit.wikimedia.org/r/54352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic40ee9ec908c8398d33ee6a6211e6c3c2b1e7eb3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45596) Set $wgCategoryCollation to 'uca-hu' on Hungaria... - change (operations/mediawiki-config)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54353 Change subject: (bug 45596) Set $wgCategoryCollation to 'uca-hu' on Hungarian Wikipedia .. (bug 45596) Set $wgCategoryCollation to 'uca-hu' on Hungarian Wikipedia Change-Id: I0cfa3859c8b77ac37b1d2ca8f3358753fcca7757 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/53/54353/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b37cdff..276a7b4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10300,6 +10300,7 @@ 'mediawikiwiki' = 'uca-default', // Single-language wikis 'iswiktionary' = 'identity', // bug 30722 + 'huwiki' = 'uca-hu', // bug 45596 'plwiki' = 'uca-pl', // bug 42413 'plwikivoyage' = 'uca-pl', // bug 45968 'ptwiki' = 'uca-pt', // bug 45911 -- To view, visit https://gerrit.wikimedia.org/r/54353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cfa3859c8b77ac37b1d2ca8f3358753fcca7757 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [TemplateData] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/54354 Change subject: [TemplateData] Register extension .. [TemplateData] Register extension Change-Id: Ibff52039f8b5a1114d476578c5116cc9c6e640c7 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/54/54354/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 1d616b7..b1da080 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1390,6 +1390,8 @@ Tabber +Template Data + Template Info Template Sandbox -- To view, visit https://gerrit.wikimedia.org/r/54354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibff52039f8b5a1114d476578c5116cc9c6e640c7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] IcuCollation::$tailoringFirstLetters: 'sv', 'vi' verified - change (mediawiki/core)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54355 Change subject: IcuCollation::$tailoringFirstLetters: 'sv', 'vi' verified .. IcuCollation::$tailoringFirstLetters: 'sv', 'vi' verified * sv: per Lejonel in comments on bug 45446 * vi: per Minh Nguyễn in comments on bug 45979 Change-Id: I96bbcd73e75f9fc85a5c0b402eae87e5cda2259e --- M includes/Collation.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/54355/1 diff --git a/includes/Collation.php b/includes/Collation.php index a0e1d2d..bed4632 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -213,7 +213,10 @@ 'pl' = array( Ą, Ć, Ę, Ł, Ń, Ó, Ś, Ź, Ż ), 'pt' = array(), 'ru' = array(), + 'sv' = array( Å, Ä, Ö ), + '-sv' = array( Þ ), // sorted as th in Swedish, causing unexpected output - bug 45446 'uk' = array( Ґ, Ь ), + 'vi' = array( Ă, Â, Đ, Ê, Ô, Ơ, Ư ), // Not verified, but likely correct 'af' = array(), 'ast' = array( Ch, Ll, Ñ ), @@ -266,14 +269,11 @@ 'smn' = array( Á, Č, Đ, Ŋ, Š, Ŧ, Ž, Æ, Ø, Å, Ä, Ö ), 'sq' = array( Ç, Dh, Ë, Gj, Ll, Nj, Rr, Sh, Th, Xh, Zh ), 'sr' = array(), - 'sv' = array( Å, Ä, Ö ), - '-sv' = array( Þ ), // sorted as th in Swedish, causing unexpected output - bug 45446 'tk' = array( Ç, Ä, Ž, Ň, Ö, Ş, Ü, Ý ), 'tl' = array( Ñ, Ng ), 'tr' = array( Ç, Ğ, İ, Ö, Ş, Ü ), 'tt' = array( Ә, Ө, Ү, Җ, Ң, Һ ), 'uz' = array( Ch, G', Ng, O', Sh ), - 'vi' = array( Ă, Â, Đ, Ê, Ô, Ơ, Ư ), ); const RECORD_LENGTH = 14; -- To view, visit https://gerrit.wikimedia.org/r/54355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96bbcd73e75f9fc85a5c0b402eae87e5cda2259e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [TemplateData] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [TemplateData] Register extension .. [TemplateData] Register extension Change-Id: Ibff52039f8b5a1114d476578c5116cc9c6e640c7 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 1d616b7..b1da080 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1390,6 +1390,8 @@ Tabber +Template Data + Template Info Template Sandbox -- To view, visit https://gerrit.wikimedia.org/r/54354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibff52039f8b5a1114d476578c5116cc9c6e640c7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 34617) all WMF MediaWiki ext to Jenkins - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54356 Change subject: (bug 34617) all WMF MediaWiki ext to Jenkins .. (bug 34617) all WMF MediaWiki ext to Jenkins Change-Id: Ief5f5e11cb4ac800c21699a0b92afc02afd05543 --- M mediawiki-extensions.yaml 1 file changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/56/54356/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 8f4d845..1352bd6 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -109,68 +109,131 @@ ext-name: - AbuseFilter + - ActiveAbstract + - AntiBot + - AntiSpoof - AdminLinks - Agora - APC - ApiSandbox - ArticleFeedbackv5 - Ask + - AntiSpoof - Babel - BlameMaps + - Calendar + - CategoryTree - CentralAuth - CentralNotice - CharInsert - CheckUser + - Cite - cldr - CleanChanges + - ClickTracking + - ClientSide + - CodeEditor + - CodeReview + - Collection + - CommunityApplications + - CommunityHiring + - CommunityVoice - ConfirmEdit + - ContactPage + - ContactPageFundraiser + - ContributionReporting + - ContributionTracking - ContributionScores + - CreditsSource + - CustomData + - CustomUserSignup - DataValues - DeleteBatch - Diff + - DisableAccount + - DismissableSiteNotice - DonationInterface + - DoubleWiki - DumpHTML + - DynamicSidebar - E3Experiments - Echo + - EditPageTracking - EducationProgram + - EmailCapture - EtherEditor - EventLogging - ExpandTemplates + - ExtensionDistributor + - FeaturedFeeds + - FormPreloadPostCache + - FundraiserLandingPage - Gadgets + - GeoCrumbs - GeoData - GettingStarted - GlobalBlocking + - GlobalUsage + - GoogleNewsSitemap - GoogleAdSense - GoogleCustomWikiSearch - GuidedTour - I18nTags + - ImageMap + - InputBox + - Insider + - intersection - Interwiki - JsonData - LabeledSectionTransclusion + - LandingCheck + - LastModified + - LdapAuthentication - LiquidThreads + - Listings - LocalisationUpdate - Maps + - MapSources + - MarkAsHelpful - Math - MobileFrontend - MoodBar - MultiMaps + - MwEmbedSupport + - MWSearch + - Narayam - NewUserMessage - Nuke - OAI - OATHAuth - Offline - OpenID + - OpenSearchXml - OpenStackManager + - PagedTiffHandler + - PageImages - PageTriage - ParserFunctions - ParserHooks - Parsoid + - PdfHandler - PHPExcel + - Poem + - PoolCounter + - PostEdit + - ProofreadPage + - Quiz + - RandomRootPage + - ReaderFeedback + - RelatedArticles + - RelatedSites - Renameuser - ReplaceText + - RSS - Score - Scribunto - SecurePoll + - SearchExtraNS - SemanticACL - SemanticBundle - SemanticCompoundQueries @@ -194,25 +257,50 @@ - SemanticTitle - SemanticUpdateOnPurge - SemanticWatchlist + - ShortUrl + - SimpleAntiSpam + - SiteMatrix + - SkinPerPage + - skins + - Solarium - SpamBlacklist + - StragegyWiki + - SubPageList3 + - SubpageSortkey + - SwiftCloudFiles - SVGEdit - SyntaxHighlight_GeSHi + - TemplateSandbox - TimedMediaHandler - TitleBlacklist + - TitleKey + - TocTree + - TorBlock - Translate - TranslationNotifications + - TrustedXFF - UniversalLanguageSelector + - UploadBlacklist - UploadWizard + - UserDailyContribs + - UserMerge - UserOptionStats + - UserThrottle - Validator - Vector + - VipsScaler - VisualEditor - WebChat + - WebFonts - Wikibase - WikiEditor + - wikihiero - WikiLexicalData + - WikiLove + - WikimediaIncubator - WikimediaMaintenance - WikimediaMessages + - WikimediaShopLink - ZeroRatedMobileAccess mwbranch: -- To view, visit https://gerrit.wikimedia.org/r/54356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief5f5e11cb4ac800c21699a0b92afc02afd05543 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 34617) all WMF MediaWiki ext to Jenkins - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54357 Change subject: (bug 34617) all WMF MediaWiki ext to Jenkins .. (bug 34617) all WMF MediaWiki ext to Jenkins Change-Id: I921a64eaf7a2c60e0b51351570255b0be50ed229 --- M layout.yaml 1 file changed, 964 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/57/54357/1 diff --git a/layout.yaml b/layout.yaml index 55793b0..dd8a552 100644 --- a/layout.yaml +++ b/layout.yaml @@ -261,11 +261,23 @@ branch: (?!REL1_19) - name: mwext-PHPExcel-jslint voting: true + - name: mwext-ActiveAbstract-jslint +voting: true + - name: mwext-AntiBot-jslint +voting: true + - name: mwext-AntiSpoof-jslint +voting: true + - name: mwext-Calendar-jslint +voting: true - name: mwext-GlobalBlocking-jslint voting: true - name: mwext-Math-jslint voting: true + - name: mwext-TemplateSandbox-jslint +voting: true - name: mwext-Translate-jslint +voting: true + - name: mwext-PostEdit-jslint voting: true - name: mwext-VisualEditor-jslint voting: true @@ -303,6 +315,10 @@ # Has an insert that introduce multiple values, that requires SQLite # version 3.7.11 - name: ^mwext-PageTriage-testextensions-master +voting: false + + # Completely broken test suite + - name: ^mwext-PagedTiffHandler-testextensions-master.* voting: false - name: mediawiki-core-master-phpunit-all @@ -512,6 +528,22 @@ - mwext-AbuseFilter-jslint - mwext-AbuseFilter-lint + - name: mediawiki/extensions/ActiveAbstract +check: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint +test: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint: + - mwext-ActiveAbstract-testextensions-master +gate-and-submit: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint: + - mwext-ActiveAbstract-testextensions-master + - name: mediawiki/extensions/AdminLinks check: - mwext-AdminLinks-merge: @@ -531,6 +563,32 @@ - mwext-Agora-merge: - mwext-Agora-jslint - mwext-Agora-lint + + - name: mediawiki/extensions/AntiBot +check: + - mwext-AntiBot-merge: +- mwext-AntiBot-jslint +- mwext-AntiBot-lint +gate-and-submit: + - mwext-AntiBot-merge: +- mwext-AntiBot-jslint +- mwext-AntiBot-lint + + - name: mediawiki/extensions/AntiSpoof +check: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint +test: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint: + - mwext-AntiSpoof-testextensions-master +gate-and-submit: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint: + - mwext-AntiSpoof-testextensions-master - name: mediawiki/extensions/APC check: @@ -600,6 +658,26 @@ - mwext-BlameMaps-lint - mwext-BlameMaps-pep8 + - name: mediawiki/extensions/Calendar +check: + - mwext-Calendar-merge: +- mwext-Calendar-jslint +- mwext-Calendar-lint +gate-and-submit: + - mwext-Calendar-merge: +- mwext-Calendar-jslint +- mwext-Calendar-lint + + - name: mediawiki/extensions/CategoryTree +check: + - mwext-CategoryTree-merge: +- mwext-CategoryTree-jslint +- mwext-CategoryTree-lint +gate-and-submit: + - mwext-CategoryTree-merge: +- mwext-CategoryTree-jslint +- mwext-CategoryTree-lint + - name: mediawiki/extensions/CharInsert check: - mwext-CharInsert-merge: @@ -619,6 +697,22 @@ - mwext-CheckUser-merge: - mwext-CheckUser-jslint - mwext-CheckUser-lint + + - name: mediawiki/extensions/Cite +check: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint +test: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint: + - mwext-Cite-testextensions-master +gate-and-submit: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint: + - mwext-Cite-testextensions-master - name: mediawiki/extensions/cldr check: @@ -667,6 +761,62 @@ - mwext-CleanChanges-jslint - mwext-CleanChanges-lint + - name: mediawiki/extensions/ClickTracking +check: + - mwext-ClickTracking-merge: +- mwext-ClickTracking-jslint +- mwext-ClickTracking-lint +gate-and-submit: + - mwext-ClickTracking-merge: +- mwext-ClickTracking-jslint +- mwext-ClickTracking-lint + + - name: mediawiki/extensions/ClientSide +check: + -
[MediaWiki-commits] [Gerrit] Update streaming range patch to M.B.Grydeland's updated version - change (operations...varnish)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54358
Change subject: Update streaming range patch to M.B.Grydeland's updated version
..
Update streaming range patch to M.B.Grydeland's updated version
---
M debian/patches/0010-varnishd-streaming-range.patch
A debian/patches/0010-varnishtest-rxbytes.patch
M debian/patches/series
3 files changed, 279 insertions(+), 82 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/58/54358/1
diff --git a/debian/patches/0010-varnishd-streaming-range.patch
b/debian/patches/0010-varnishd-streaming-range.patch
index 6981ef5..b62fd37 100644
--- a/debian/patches/0010-varnishd-streaming-range.patch
+++ b/debian/patches/0010-varnishd-streaming-range.patch
@@ -1,16 +1,23 @@
+From 8dea335b22760784b545d93eaa663b27d6ccef85 Mon Sep 17 00:00:00 2001
+From: Martin Blix Grydeland mar...@varnish-software.com
+Date: Wed, 19 Dec 2012 13:20:22 +0100
+Subject: [PATCH 2/2] Add Range support to Varnish in streaming mode.
+
+This patch is largely based on work by Mark Bergsma of WikiMedia.
+---
+ bin/varnishd/cache.h |4 +-
+ bin/varnishd/cache_center.c |7 ++-
+ bin/varnishd/cache_response.c| 117 +-
+ bin/varnishtest/tests/t00013.vtc | 53 +
+ bin/varnishtest/tests/t00014.vtc | 30 ++
+ 5 files changed, 180 insertions(+), 31 deletions(-)
+ create mode 100644 bin/varnishtest/tests/t00013.vtc
+ create mode 100644 bin/varnishtest/tests/t00014.vtc
+
diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
-index 0ad00d8..0ed2f96 100644
+index 0ad00d8..d7e617a 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
-@@ -285,7 +285,7 @@ struct stream_ctx {
- ssize_t stream_front;
- struct storage *stream_frontchunk;
-
-- /* Max byte we can stream */
-+ /* Max byte count we can stream at a given moment */
- ssize_t stream_max;
- };
-
@@ -910,11 +910,11 @@ void WSL_Flush(struct worker *w, int overflow);
/* cache_response.c */
void RES_BuildHttp(const struct sess *sp);
@@ -21,15 +28,15 @@
int RES_StreamPoll(const struct sess *sp);
void RES_StreamWrite(const struct sess *sp);
-void RES_StreamBody(struct sess *sp);
-+void RES_StreamBody(struct sess *sp, const ssize_t start, const ssize_t end);
++void RES_StreamBody(struct sess *sp, const ssize_t low, const ssize_t high);
/* cache_vary.c */
struct vsb *VRY_Create(const struct sess *sp, const struct http *hp);
diff --git a/bin/varnishd/cache_center.c b/bin/varnishd/cache_center.c
-index 61d3fb4..27038b7 100644
+index 61d3fb4..a3c4036 100644
--- a/bin/varnishd/cache_center.c
+++ b/bin/varnishd/cache_center.c
-@@ -923,16 +923,17 @@ DOT }
+@@ -923,16 +923,19 @@ DOT }
static int
cnt_streamdeliver(struct sess *sp)
{
@@ -40,29 +47,32 @@
CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
- RES_StreamStart(sp);
++ low = 0;
++ high = -1;
+ RES_StreamStart(sp, low, high);
sp-wrk-h_content_length = NULL;
if (sp-wantbody)
- RES_StreamBody(sp);
-+ RES_StreamBody(sp, low, (high == -1 ? SSIZE_MAX : high + 1));
++ RES_StreamBody(sp, low, high);
RES_StreamEnd(sp);
diff --git a/bin/varnishd/cache_response.c b/bin/varnishd/cache_response.c
-index bdd967c..481c28e 100644
+index bdd967c..acf4a62 100644
--- a/bin/varnishd/cache_response.c
+++ b/bin/varnishd/cache_response.c
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,8 @@
/**/
static void
-res_dorange(const struct sess *sp, const char *r, ssize_t *plow, ssize_t
*phigh)
-+res_dorange(const struct sess *sp, const char *r, const ssize_t content_len,
ssize_t *plow, ssize_t *phigh)
++res_dorange(const struct sess *sp, const char *r, const ssize_t content_len,
++ ssize_t *plow, ssize_t *phigh)
{
ssize_t low, high, has_low;
-@@ -63,7 +63,7 @@ res_dorange(const struct sess *sp, const char *r, ssize_t
*plow, ssize_t *phigh)
+@@ -63,7 +64,7 @@ res_dorange(const struct sess *sp, const char *r, ssize_t
*plow, ssize_t *phigh)
r++;
}
@@ -71,7 +81,7 @@
return;
if (*r != '-')
-@@ -79,23 +79,23 @@ res_dorange(const struct sess *sp, const char *r, ssize_t
*plow, ssize_t *phigh)
+@@ -79,23 +80,23 @@ res_dorange(const struct sess *sp, const char *r, ssize_t
*plow, ssize_t *phigh)
r++;
}
if (!has_low) {
@@ -101,7 +111,7 @@
http_Unset(sp-wrk-resp, H_Content_Length);
assert(sp-wrk-res_mode RES_LEN);
http_PrintfHeader(sp-wrk, sp-fd, sp-wrk-resp,
-@@ -285,7 +285,7 @@ RES_WriteObj(struct sess *sp)
+@@ -285,7 +286,7 @@ RES_WriteObj(struct sess *sp)
params-http_range_support
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm7) precise; urgency=low - change (operations...varnish)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/54359 Change subject: varnish (3.0.3plus~rc1-wm7) precise; urgency=low .. varnish (3.0.3plus~rc1-wm7) precise; urgency=low * Update streaming range patch to M.B.Grydeland's updated version --- M debian/changelog 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/59/54359/1 diff --git a/debian/changelog b/debian/changelog index 4ccf4bd..85b63de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +varnish (3.0.3plus~rc1-wm7) precise; urgency=low + + * Update streaming range patch to M.B.Grydeland's updated version + + -- Mark Bergsma m...@wikimedia.org Mon, 11 Feb 2013 13:09:54 + + varnish (3.0.3plus~rc1-wm6) precise; urgency=low * Fix a deadlock of worker threads on the vca_pipe under load - -- Mark Bergsma m...@wikimedia.org Fri, 23 Nov 2012 13:51:55 + + -- Mark Bergsma m...@wikimedia.org Mon, 11 Feb 2013 13:08:51 + varnish (3.0.3plus~rc1-wm5) precise; urgency=low -- To view, visit https://gerrit.wikimedia.org/r/54359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ea8697a0db60db00f84b0fbb53b50b5051e3570 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable internal jemalloc so the system jemalloc can be used - change (operations...varnish)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/54360 Change subject: Disable internal jemalloc so the system jemalloc can be used .. Disable internal jemalloc so the system jemalloc can be used --- M debian/rules 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/60/54360/1 diff --git a/debian/rules b/debian/rules index 8b4d067..40eaac5 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,9 @@ # Set local state dir for FHS LOCAL_CONFIGURE_FLAGS = --localstatedir=/var/lib -ifneq ($(filter $(DEB_HOST_ARCH),$(DISABLE_JEMALLOC_ARCH_LIST)),) -LOCAL_CONFIGURE_FLAGS += --disable-jemalloc -endif +#ifneq ($(filter $(DEB_HOST_ARCH),$(DISABLE_JEMALLOC_ARCH_LIST)),) +LOCAL_CONFIGURE_FLAGS += --with-jemalloc=no +#endif # Main build rule, leave everything to debhelper %: -- To view, visit https://gerrit.wikimedia.org/r/54360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I668bd99fceebf8c5efb18aeae00978cc75085dc1 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus-rc1-1~1.gbpae5519) UNRELEASED; urgency=low - change (operations...varnish)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/54361 Change subject: varnish (3.0.3plus-rc1-1~1.gbpae5519) UNRELEASED; urgency=low .. varnish (3.0.3plus-rc1-1~1.gbpae5519) UNRELEASED; urgency=low ** SNAPSHOT build @ae55191094fe2d33b3a03faa7cfd94b78e22aa04 ** * Disable internal jemalloc so the system jemalloc can be used --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/61/54361/1 diff --git a/debian/changelog b/debian/changelog index 85b63de..e91f19a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +varnish (3.0.3plus-rc1-1~1.gbpae5519) UNRELEASED; urgency=low + + ** SNAPSHOT build @ae55191094fe2d33b3a03faa7cfd94b78e22aa04 ** + + * Disable internal jemalloc so the system jemalloc can be used + + -- Mark Bergsma m...@wikimedia.org Fri, 08 Mar 2013 14:59:49 + + varnish (3.0.3plus~rc1-wm7) precise; urgency=low * Update streaming range patch to M.B.Grydeland's updated version -- To view, visit https://gerrit.wikimedia.org/r/54361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I959a5481643bf08a5ba42d2e5e989321b975831d Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refresh the varnishncsa udplog patch against 3.0.3plus-rc1 - change (operations...varnish)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54362
Change subject: Refresh the varnishncsa udplog patch against 3.0.3plus-rc1
..
Refresh the varnishncsa udplog patch against 3.0.3plus-rc1
Change-Id: I347f309e247f9ed84c7c6e491a0761d20c273cb2
---
M debian/patches/0010-varnishncsa-udplog.patch
1 file changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/62/54362/1
diff --git a/debian/patches/0010-varnishncsa-udplog.patch
b/debian/patches/0010-varnishncsa-udplog.patch
index 2c579d4..7690dd2 100644
--- a/debian/patches/0010-varnishncsa-udplog.patch
+++ b/debian/patches/0010-varnishncsa-udplog.patch
@@ -1,7 +1,7 @@
-Index: varnish/bin/varnishncsa/varnishncsa.c
-===
varnish.orig/bin/varnishncsa/varnishncsa.c 2012-10-12 17:14:16.529579142
+1100
-+++ varnish/bin/varnishncsa/varnishncsa.c 2012-10-12 17:15:13.310570391
+1100
+diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
+index ff07ed5..66edc6d 100644
+--- a/bin/varnishncsa/varnishncsa.c
b/bin/varnishncsa/varnishncsa.c
@@ -62,6 +62,7 @@
#include ctype.h
#include signal.h
@@ -24,7 +24,7 @@
static volatile sig_atomic_t reopen;
struct hdr {
-@@ -87,6 +95,11 @@
+@@ -87,6 +95,11 @@ struct hdr {
VTAILQ_ENTRY(hdr) list;
};
@@ -36,7 +36,7 @@
static struct logline {
char *df_H; /* %H, Protocol version */
char *df_U; /* %U, URL path */
-@@ -115,6 +128,8 @@
+@@ -116,6 +129,8 @@ static int m_flag = 0;
static const char *format;
@@ -45,7 +45,7 @@
static int
isprefix(const char *str, const char *prefix, const char *end,
const char **next)
-@@ -526,6 +541,31 @@
+@@ -565,6 +580,31 @@ collect_client(struct logline *lp, enum VSL_tag_e tag,
unsigned spec,
return (1);
}
@@ -77,7 +77,7 @@
static int
h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
unsigned len, unsigned spec, const char *ptr, uint64_t bitmap)
-@@ -534,7 +574,9 @@
+@@ -573,7 +613,9 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
FILE *fo = priv;
char *q, tbuf[64];
const char *p;
@@ -87,7 +87,7 @@
if (fd = nll) {
struct logline **newll = ll;
-@@ -582,7 +624,9 @@
+@@ -621,7 +663,9 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
/* We have a complete data set - log a line */
@@ -98,7 +98,7 @@
os = VSB_new_auto();
for (p = format; *p != '\0'; p++) {
-@@ -610,12 +654,17 @@
+@@ -657,12 +701,17 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
VSB_cat(os, lp-df_h ? lp-df_h : -);
break;
case 'l':
@@ -117,7 +117,7 @@
case 'q':
VSB_cat(os, lp-df_q ? lp-df_q : );
-@@ -648,7 +697,7 @@
+@@ -695,7 +744,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
case 't':
/* %t */
@@ -126,7 +126,7 @@
VSB_cat(os, tbuf);
break;
-@@ -694,7 +743,13 @@
+@@ -741,7 +790,13 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
switch (type) {
case 'i':
h = req_header(lp, fname);
@@ -141,7 +141,7 @@
p = tmp;
break;
case 'o':
-@@ -733,8 +788,10 @@
+@@ -793,8 +848,10 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
/* flush the stream */
VSB_finish(os);
@@ -153,7 +153,7 @@
/* clean up */
clean_logline(lp);
-@@ -753,15 +810,71 @@
+@@ -813,15 +870,71 @@ sighup(int sig)
}
static FILE *
@@ -180,10 +180,12 @@
+ }
+
+ server = gethostbyname(host);
-+
+
+- if ((of = fopen(ofn, append ? a : w)) == NULL) {
+- perror(ofn);
+if (server == NULL) {
+ fprintf(stderr,ERROR, no such host\n);
-+ exit(1);
+ exit(1);
+}
+
+ bzero((char *) serv_addr, sizeof(serv_addr));
@@ -200,15 +202,13 @@
+ sizeof(unsigned char));
+ setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_LOOP, /* don't send
to own interface */
+ (char *)loopch, sizeof(loopch));
-+ }
-
-- if ((of = fopen(ofn, append ? a : w)) == NULL) {
-- perror(ofn);
-+ if (connect(sockfd,(struct sockaddr *) serv_addr,sizeof(serv_addr))
0) {
-+ perror(socket);
- exit(1);
}
- return (of);
++
++ if (connect(sockfd,(struct sockaddr *) serv_addr,sizeof(serv_addr))
0) {
++ perror(socket);
++ exit(1);
++ }
+
+ FILE *sf =
[MediaWiki-commits] [Gerrit] Remove escaping of spaces in header lines - change (operations...varnish)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54363
Change subject: Remove escaping of spaces in header lines
..
Remove escaping of spaces in header lines
We now use tabs as field separators.
This also removes the need for function str_replace
Change-Id: I1314260debd3040ac432f637d69b3dad2dd969a9
---
M debian/patches/0010-varnishncsa-udplog.patch
1 file changed, 22 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/63/54363/1
diff --git a/debian/patches/0010-varnishncsa-udplog.patch
b/debian/patches/0010-varnishncsa-udplog.patch
index 7690dd2..107ebad 100644
--- a/debian/patches/0010-varnishncsa-udplog.patch
+++ b/debian/patches/0010-varnishncsa-udplog.patch
@@ -1,5 +1,5 @@
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
-index ff07ed5..66edc6d 100644
+index ff07ed5..10f5c8a 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -62,6 +62,7 @@
@@ -45,49 +45,15 @@
static int
isprefix(const char *str, const char *prefix, const char *end,
const char **next)
-@@ -565,6 +580,31 @@ collect_client(struct logline *lp, enum VSL_tag_e tag,
unsigned spec,
- return (1);
- }
-
-+char *str_replace(const char *s, const char *old, const char *new)
-+{
-+ char *ret;
-+ int i = 0;
-+ size_t newlen = strlen(new);
-+ size_t oldlen = strlen(old);
-+
-+ ret = malloc(4096);
-+ if (ret == NULL)
-+ exit(1);
-+
-+ i = 0;
-+ while (*s) {
-+ if (strstr(s, old) == s) {
-+ strcpy(ret[i], new);
-+ i += newlen;
-+ s += oldlen;
-+ } else
-+ ret[i++] = *s++;
-+ }
-+ ret[i] = '\0';
-+
-+ return ret;
-+}
-+
- static int
- h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
- unsigned len, unsigned spec, const char *ptr, uint64_t bitmap)
-@@ -573,7 +613,9 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
- FILE *fo = priv;
+@@ -574,6 +589,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
char *q, tbuf[64];
const char *p;
-+ char *nh;
struct vsb *os;
+ struct ncsa_opts *opts;
if (fd = nll) {
struct logline **newll = ll;
-@@ -621,7 +663,9 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
+@@ -621,7 +637,9 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
/* We have a complete data set - log a line */
@@ -98,7 +64,7 @@
os = VSB_new_auto();
for (p = format; *p != '\0'; p++) {
-@@ -657,12 +701,17 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
+@@ -657,12 +675,17 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
VSB_cat(os, lp-df_h ? lp-df_h : -);
break;
case 'l':
@@ -117,7 +83,7 @@
case 'q':
VSB_cat(os, lp-df_q ? lp-df_q : );
-@@ -695,7 +744,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
+@@ -695,7 +718,7 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
case 't':
/* %t */
@@ -126,22 +92,7 @@
VSB_cat(os, tbuf);
break;
-@@ -741,7 +790,13 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
- switch (type) {
- case 'i':
- h = req_header(lp, fname);
-- VSB_cat(os, h ? h : -);
-+ if (h) {
-+ nh = str_replace(h, , %20);
-+ VSB_cat(os, nh);
-+ free(nh);
-+ } else {
-+ VSB_cat(os, -);
-+ }
- p = tmp;
- break;
- case 'o':
-@@ -793,8 +848,10 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
+@@ -793,8 +816,10 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
/* flush the stream */
VSB_finish(os);
@@ -153,7 +104,7 @@
/* clean up */
clean_logline(lp);
-@@ -813,15 +870,71 @@ sighup(int sig)
+@@ -813,15 +838,71 @@ sighup(int sig)
}
static FILE *
@@ -180,12 +131,10 @@
+ }
+
+ server = gethostbyname(host);
-
-- if ((of = fopen(ofn, append ? a : w)) == NULL) {
-- perror(ofn);
++
+if (server == NULL) {
+ fprintf(stderr,ERROR, no such host\n);
- exit(1);
++ exit(1);
+}
+
+ bzero((char *) serv_addr, sizeof(serv_addr));
@@ -202,8 +151,7 @@
+ sizeof(unsigned char));
+
[MediaWiki-commits] [Gerrit] (bug 46005) Set $wgCategoryCollation to 'uca-be-tarask' on b... - change (operations/mediawiki-config)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54364 Change subject: (bug 46005) Set $wgCategoryCollation to 'uca-be-tarask' on be-x-old.wikipedia .. (bug 46005) Set $wgCategoryCollation to 'uca-be-tarask' on be-x-old.wikipedia (be-x-old is just a dummy code for be-tarask.) Change-Id: I37252d5d0dd02dec2b55b948b82d1afaed6e75a8 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/54364/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 276a7b4..75d94ee 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10299,6 +10299,7 @@ // Multilingual wikis 'mediawikiwiki' = 'uca-default', // Single-language wikis + 'be_x_oldwiki' = 'uca-be-tarask', // bug 46005 'iswiktionary' = 'identity', // bug 30722 'huwiki' = 'uca-hu', // bug 45596 'plwiki' = 'uca-pl', // bug 42413 -- To view, visit https://gerrit.wikimedia.org/r/54364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37252d5d0dd02dec2b55b948b82d1afaed6e75a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46004) Set $wgCategoryCollation to 'uca-be' on be.wikip... - change (operations/mediawiki-config)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54365 Change subject: (bug 46004) Set $wgCategoryCollation to 'uca-be' on be.wikipedia .. (bug 46004) Set $wgCategoryCollation to 'uca-be' on be.wikipedia Change-Id: Id4fb5e55463973678144a1a22452923170c59963 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/65/54365/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 75d94ee..9eed945 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10300,6 +10300,7 @@ 'mediawikiwiki' = 'uca-default', // Single-language wikis 'be_x_oldwiki' = 'uca-be-tarask', // bug 46005 + 'bewiki' = 'uca-be', // bug 46004 'iswiktionary' = 'identity', // bug 30722 'huwiki' = 'uca-hu', // bug 45596 'plwiki' = 'uca-pl', // bug 42413 -- To view, visit https://gerrit.wikimedia.org/r/54365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4fb5e55463973678144a1a22452923170c59963 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia (3.5.0-wm1) precise; urgency=low - change (operations...ganglia)
Mark Bergsma has submitted this change and it was merged.
Change subject: ganglia (3.5.0-wm1) precise; urgency=low
..
ganglia (3.5.0-wm1) precise; urgency=low
* Imported Upstream version 3.5.0
* Applied diff by Nicholas Satterly
---
M debian/changelog
A debian/patches/php-version-hack
M debian/patches/series
M debian/rules
4 files changed, 50 insertions(+), 15 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 243423f..bcfd306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ganglia (3.5.0-wm1) precise; urgency=low
+
+ * Imported Upstream version 3.5.0
+ * Applied diff by Nicholas Satterly
+
+ -- Mark Bergsma m...@wikimedia.org Tue, 12 Mar 2013 14:44:37 +
+
ganglia (3.3.8-2) UNRELEASED; urgency=low
* Add a debian/watch file.
diff --git a/debian/patches/php-version-hack b/debian/patches/php-version-hack
new file mode 100644
index 000..e2419ae
--- /dev/null
+++ b/debian/patches/php-version-hack
@@ -0,0 +1,39 @@
+Description: php-version-hack
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ ganglia (3.5.0-1) UNRELEASED; urgency=low
+ .
+ * New upstream release
+Author: Nick Satterly nick.satterly at guardian.co.uk
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: vendor|upstream|other, url of original patch
+Bug: url in upstream bugtracker
+Bug-Debian: http://bugs.debian.org/bugnumber
+Bug-Ubuntu: https://launchpad.net/bugs/bugnumber
+Forwarded: no|not-needed|url proving that it has been forwarded
+Reviewed-By: name and email of someone who approved the patch
+Last-Update: -MM-DD
+
+--- ganglia-3.5.0.orig/configure.in
ganglia-3.5.0/configure.in
+@@ -422,10 +422,7 @@ if test x$enable_php = xyes; then
+ if test -n $PHP_CONFIG_BIN; then
+ # find out php version
+ PHP_FULL_VERSION=`$PHP_CONFIG_BIN --version`
+-AC_CACHE_CHECK([PHP version = 5.3], [php_cv_version_5],
+-[AX_COMPARE_VERSION([$PHP_FULL_VERSION], [ge], [5.3],
+-[php_cv_version_5=yes],
+-[php_cv_version_5=no])])
++php_cv_version_5=yes
+ if test $php_cv_version_5 = yes; then
+ PHP_VERSION=5
+ else
diff --git a/debian/patches/series b/debian/patches/series
index bdb242d..1f41692 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-large_block_count.patch
+php-version-hack
diff --git a/debian/rules b/debian/rules
index a8ee5b5..3b3a9b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,11 +36,9 @@
--libdir=\$${prefix}/lib \
--sysconfdir=/etc/ganglia \
--infodir=\$${prefix}/share/info --enable-shared \
- --with-gmetad
-build: build-stamp
- make -C web
+ --with-gmetad --enable-status
-build-stamp: config.status
+build: config.status
dh_testdir
# Add here commands to compile the package.
@@ -60,8 +58,7 @@
# -rm -f dotconf-1.0.9/conftest
-rm -f libtool.old \
ganglia-config contrib/ganglia_gmond.xml gmetad/gmetad.conf \
- gmond/gmond.solaris.init gmond/modules/conf.d/modpython.conf
solaris/pkginfo \
- web/conf.php
+ gmond/gmond.solaris.init gmond/modules/conf.d/modpython.conf
solaris/pkginfo
debconf-updatepo
dh_autotools-dev_restoreconfig
dh_clean
@@ -91,14 +88,6 @@
debian/ganglia-monitor-python/etc/ganglia/conf.d/
cp gmond/python_modules/*/*.py \
debian/ganglia-monitor-python/usr/lib/ganglia/python_modules/
-
-#Install webfrontend
- $(MAKE) -C web install APACHE_USER=www-data
DESTDIR=$(CURDIR)/debian/ganglia-webfrontend/usr/share/ganglia-webfrontend
GWEB_STATEDIR=$(CURDIR)/debian/ganglia-webfrontend/var/lib
- mkdir -p debian/ganglia-webfrontend/etc/apache2/conf.d/
- cp -f web/debian/apache.conf \
-debian/ganglia-webfrontend/etc/ganglia-webfrontend
- cp -f web/debian/conf_debian.php \
-
debian/ganglia-webfrontend/usr/share/ganglia-webfrontend/conf.php
# Build architecture-independent files here.
binary-indep: build install
--
To view, visit https://gerrit.wikimedia.org/r/53374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40b711eb7c896f2e06e59435274e4a8058e5b77d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/ganglia
Gerrit-Branch: master
Gerrit-Owner: Mark
[MediaWiki-commits] [Gerrit] Update streaming range patch to M.B.Grydeland's updated version - change (operations...varnish)
Mark Bergsma has submitted this change and it was merged. Change subject: Update streaming range patch to M.B.Grydeland's updated version .. Update streaming range patch to M.B.Grydeland's updated version --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Mark Bergsma: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/54358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e96812c99a874bd10bc2ef93d9ab6cff6019879 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46081) Set $wgCategoryCollation to 'uca-default' on Pol... - change (operations/mediawiki-config)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/54367 Change subject: (bug 46081) Set $wgCategoryCollation to 'uca-default' on Polish Wiktionary .. (bug 46081) Set $wgCategoryCollation to 'uca-default' on Polish Wiktionary Change-Id: Ie92f54893851b91342c94490adbcc15cae6da05c --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/67/54367/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b2898ee..5331872 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10306,6 +10306,7 @@ 'huwiki' = 'uca-hu', // bug 45596 'plwiki' = 'uca-pl', // bug 42413 'plwikivoyage' = 'uca-pl', // bug 45968 + 'plwiktionary' = 'uca-default', // bug 46081 'ptwiki' = 'uca-pt', // bug 45911 'ptwikibooks' = 'uca-pt', // bug 45911 'svwiki' = 'uca-sv', // bug 45446 -- To view, visit https://gerrit.wikimedia.org/r/54367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie92f54893851b91342c94490adbcc15cae6da05c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45308) added missing check issset( $_SESSION ) - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54366
Change subject: (bug 45308) added missing check issset( $_SESSION )
..
(bug 45308) added missing check issset( $_SESSION )
Change-Id: I94d797a22583f508a4e473e83058ca7c8f124fd0
---
M SpecialOpenIDServer.body.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/66/54366/4
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 9f7ef77..1097122 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -750,8 +750,10 @@
}
function ClearValues() {
- unset( $_SESSION['openid_server_request'] );
- unset( $_SESSION['openid_server_sreg'] );
+ if ( isset( $_SESSION ) ) {
+ unset( $_SESSION['openid_server_request'] );
+ unset( $_SESSION['openid_server_sreg'] );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/54366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94d797a22583f508a4e473e83058ca7c8f124fd0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45308) added missing check issset( $_SESSION ) - change (mediawiki...OpenID)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45308) added missing check issset( $_SESSION )
..
(bug 45308) added missing check issset( $_SESSION )
Change-Id: I94d797a22583f508a4e473e83058ca7c8f124fd0
---
M SpecialOpenIDServer.body.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 9f7ef77..1097122 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -750,8 +750,10 @@
}
function ClearValues() {
- unset( $_SESSION['openid_server_request'] );
- unset( $_SESSION['openid_server_sreg'] );
+ if ( isset( $_SESSION ) ) {
+ unset( $_SESSION['openid_server_request'] );
+ unset( $_SESSION['openid_server_sreg'] );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/54366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94d797a22583f508a4e473e83058ca7c8f124fd0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
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 allowcoordinates + Add comments for grep - change (mediawiki...Maps)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54369
Change subject: Fix allowcoordinates + Add comments for grep
..
Fix allowcoordinates + Add comments for grep
Replacing directional by allowcoordinates in Maps_Finddestination.php
Change-Id: Ia93b0f9ac99a4884dae96309d448ce4a0327edb0
---
M includes/Maps_Mapper.php
M includes/parserhooks/Maps_Coordinates.php
M includes/parserhooks/Maps_DisplayMap.php
M includes/parserhooks/Maps_Distance.php
M includes/parserhooks/Maps_Finddestination.php
M includes/parserhooks/Maps_Geocode.php
M includes/parserhooks/Maps_Geodistance.php
M includes/parserhooks/Maps_MapsDoc.php
8 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Maps
refs/changes/69/54369/1
diff --git a/includes/Maps_Mapper.php b/includes/Maps_Mapper.php
index bfb81dc..487408d 100644
--- a/includes/Maps_Mapper.php
+++ b/includes/Maps_Mapper.php
@@ -59,6 +59,9 @@
'manipulatedefault' = false,
);
+ // Give grep a chance to find the usages:
+ // maps-par-mappingservice, maps-par-geoservice, maps-par-width,
+ // maps-par-height, maps-par-centre
foreach ( $params as $name = $data ) {
$data['name'] = $name;
$data['message'] = 'maps-par-' . $name;
diff --git a/includes/parserhooks/Maps_Coordinates.php
b/includes/parserhooks/Maps_Coordinates.php
index dbe6040..f011777 100644
--- a/includes/parserhooks/Maps_Coordinates.php
+++ b/includes/parserhooks/Maps_Coordinates.php
@@ -57,6 +57,8 @@
'default' = $egMapsCoordinateDirectional,
);
+ // Give grep a chance to find the usages:
+ // maps-coordinates-par-location, maps-coordinates-par-format,
maps-coordinates-par-directional
foreach ( $params as $name = $param ) {
$param['message'] = 'maps-coordinates-par-' . $name;
}
diff --git a/includes/parserhooks/Maps_DisplayMap.php
b/includes/parserhooks/Maps_DisplayMap.php
index 05862b4..a6136d9 100644
--- a/includes/parserhooks/Maps_DisplayMap.php
+++ b/includes/parserhooks/Maps_DisplayMap.php
@@ -149,6 +149,12 @@
'default' = false,
);
+ // Give grep a chance to find the usages:
+ // maps-displaymap-par-title, maps-displaymap-par-label,
maps-displaymap-par-icon,
+ // maps-displaymap-par-visitedicon, aps-displaymap-par-lines,
maps-displaymap-par-polygons,
+ // maps-displaymap-par-circles, maps-displaymap-par-rectangles,
maps-displaymap-par-wmsoverlay,
+ // maps-displaymap-par-maxzoom, maps-displaymap-par-minzoom,
maps-displaymap-par-copycoords,
+ // maps-displaymap-par-static
foreach ( $params as $name = $param ) {
if ( !array_key_exists( 'message', $param ) ) {
$param['message'] = 'maps-displaymap-par-' .
$name;
diff --git a/includes/parserhooks/Maps_Distance.php
b/includes/parserhooks/Maps_Distance.php
index 9af9741..7e79de7 100644
--- a/includes/parserhooks/Maps_Distance.php
+++ b/includes/parserhooks/Maps_Distance.php
@@ -53,6 +53,8 @@
'default' = $egMapsDistanceDecimals,
);
+ // Give grep a chance to find the usages:
+ // maps-distance-par-distance, maps-distance-par-unit,
maps-distance-par-decimals
foreach ( $params as $name = $param ) {
$param['message'] = 'maps-distance-par-' . $name;
}
diff --git a/includes/parserhooks/Maps_Finddestination.php
b/includes/parserhooks/Maps_Finddestination.php
index 67f801c..d13cee8 100644
--- a/includes/parserhooks/Maps_Finddestination.php
+++ b/includes/parserhooks/Maps_Finddestination.php
@@ -80,11 +80,16 @@
'tolower' = true,
);
- $params['directional'] = array(
+ $params['allowcoordinates'] = array(
'type' = 'boolean',
'default' = $egMapsAllowCoordsGeocoding,
);
+ // Give grep a chance to find the usages:
+ // maps-finddestination-par-location,
maps-finddestination-par-format,
+ // maps-finddestination-par-directional,
maps-finddestination-par-bearing,
+ // maps-finddestination-par-distance,
maps-finddestination-par-mappingservice,
+ // maps-finddestination-par-geoservice,
maps-finddestination-par-allowcoordinates
foreach ( $params as $name = $param ) {
$param['message'] = 'maps-finddestination-par-' . $name;
}
diff --git
[MediaWiki-commits] [Gerrit] Show/hide the wikibase watchlist entries server side - change (mediawiki...Wikibase)
Aude has submitted this change and it was merged.
Change subject: Show/hide the wikibase watchlist entries server side
..
Show/hide the wikibase watchlist entries server side
(Requires I79811e9f3e7431e3403cf93674667d624d3d4db2)
patchset 8: fixed improved selenium tests
Change-Id: I267a755a70cdc7d4937ab70364b34e73da780ef0
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/resources/Resources.php
D client/resources/wbclient.watchlist.css
D client/resources/wbclient.watchlist.js
D client/tests/qunit/wbclient.watchlist.tests.js
M client/tests/selenium/special/client_rc_and_wl_spec.rb
M selenium/lib/pages/watchlist_page.rb
8 files changed, 53 insertions(+), 301 deletions(-)
Approvals:
Tobias Gritschacher: Verified
Aude: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index c466e25..b3081f7 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -97,32 +97,6 @@
}
/**
-* Add new javascript testing modules. This is called after the
addition of MediaWiki core test suites.
-* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
-*
-* @since 0.4
-*
-* @param array $testModules
-* @param \ResourceLoader $resourceLoader
-*
-* @return boolean
-*/
-public static function onRegisterQUnitTests( array $testModules,
\ResourceLoader $resourceLoader ) {
- $testModules['qunit']['wikibase.client.watchlist.test'] = array(
- 'scripts' = array(
- 'tests/qunit/wbclient.watchlist.tests.js'
- ),
- 'dependencies' = array(
- 'wbclient.watchlist',
- 'wbclient.watchlist.css'
- ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'Wikibase/client'
- );
- return true;
- }
-
- /**
* Deletes all the data stored on the repository.
*
* @since 0.2
@@ -503,7 +477,12 @@
wfProfileIn( __METHOD__ );
- if ( $wgRequest-getBool( 'enhanced', $wgUser-getOption(
'usenewrc' ) ) === false ) {
+ if (
+ // Don't act on activated enhanced watchlist
+ $wgRequest-getBool( 'enhanced', $wgUser-getOption(
'usenewrc' ) ) === false
+ // Or in case the user disabled it
+ $wgRequest-getBool( 'hideWikibase',
!$wgUser-getOption( 'wlshowwikibase' ) ) === false
+ ) {
$dbr = wfGetDB( DB_SLAVE );
$newConds = array();
@@ -716,29 +695,6 @@
}
/**
-* Adds a JS stuff that provides a toggle for wikibase edits on the
watchlist
-*
-* @param \SpecialPage $special
-* @param string $subpage
-*
-* @return bool
-*/
- public static function onSpecialPageBeforeExecute( \SpecialPage
$special, $subpage ) {
- if ( $special-getName() === 'Watchlist' ) {
- $context = $special-getContext();
-
- if ( $context-getRequest()-getBool( 'enhanced',
$context-getUser()-getOption( 'usenewrc' ) ) === false ) {
- $special-getOutput()-addModules( array(
- 'wbclient.watchlist.css',
- 'wbclient.watchlist',
- ) );
- }
- }
-
- return true;
- }
-
- /**
* Register the parser functions.
*
* @param $parser \Parser
@@ -774,4 +730,27 @@
return true;
}
+ /**
+* Modifies watchlist options to show a toggle for Wikibase changes
+* @see
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialWatchlistFilters
+*
+* @since 0.4
+*
+* @param SpecialWatchlist $special
+* @param array $filters
+*
+* @return bool
+*/
+ public static function onSpecialWatchlistFilters( $special, $filters )
{
+ $user = $special-getContext()-getUser();
+
+ if ( $special-getContext()-getRequest()-getBool( 'enhanced',
$user-getOption( 'usenewrc' ) ) === false ) {
+ // Allow toggling wikibase changes in case the enhanced
watchlist is disabled
+ $filters['hideWikibase'] = array(
+ 'msg' = 'wikibase-rc-hide-wikidata',
+ 'default' = !$user-getBoolOption(
'wlshowwikibase' )
+ );
+
[MediaWiki-commits] [Gerrit] removed inline comments for legacy pre-2.00 versions which w... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54370
Change subject: removed inline comments for legacy pre-2.00 versions which will
never be needed again
..
removed inline comments for legacy pre-2.00 versions which will never be needed
again
Change-Id: I210eb3fd81fe801d1d6def58beac139e5011bf8a
---
M SpecialOpenIDServer.body.php
1 file changed, 0 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/70/54370/1
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 1097122..78bff57 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -305,18 +305,6 @@
wfDebug( OpenID: OpenIDServer received: '$url'.\n );
wfDebug( OpenID: OpenIDServer received request: . print_r(
$request, true ) . \n );
-/* pre-version-2.00 behaviour: OpenID Server was only supported
for existing userpages
-
- $name = $this-UrlToUserName( $url );
-
- if ( !isset( $name ) || strlen( $name ) == 0 ) {
- wfDebug( OpenID: '$url' not a user page.\n );
- return $request-answer( false, $this-serverUrl() );
- }
-
- assert( isset( $name ) strlen( $name ) 0 );
-*/
-
# by default, use the $wgUser if s/he is logged-in on this
OpenID-Server-Wiki
# check, if there is an expressed request for a distinct
OpenID-Server-Username
@@ -363,19 +351,6 @@
wfDebug( OpenID: User is logged in\n );
assert( $wgUser-getId() != 0 );
-
-/* pre-version-2.00 behaviour: OpenID Server was only supported
for existing userpages
-
- # Is the user page for the logged-in user?
-
- $user = User::newFromName( $name );
-
- if ( !isset( $user ) ||
- $user-getId() != $wgUser-getId() ) {
- wfDebug( OpenID: User from url not logged in user.\n
);
- return $request-answer( false, $this-serverUrl() );
- }
-*/
# Is the user an OpenID user?
--
To view, visit https://gerrit.wikimedia.org/r/54370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I210eb3fd81fe801d1d6def58beac139e5011bf8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removed inline comments for legacy pre-2.00 versions which w... - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: removed inline comments for legacy pre-2.00 versions which will
never be needed again
..
removed inline comments for legacy pre-2.00 versions which will never be needed
again
Change-Id: I210eb3fd81fe801d1d6def58beac139e5011bf8a
---
M SpecialOpenIDServer.body.php
1 file changed, 0 insertions(+), 25 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 1097122..78bff57 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -305,18 +305,6 @@
wfDebug( OpenID: OpenIDServer received: '$url'.\n );
wfDebug( OpenID: OpenIDServer received request: . print_r(
$request, true ) . \n );
-/* pre-version-2.00 behaviour: OpenID Server was only supported
for existing userpages
-
- $name = $this-UrlToUserName( $url );
-
- if ( !isset( $name ) || strlen( $name ) == 0 ) {
- wfDebug( OpenID: '$url' not a user page.\n );
- return $request-answer( false, $this-serverUrl() );
- }
-
- assert( isset( $name ) strlen( $name ) 0 );
-*/
-
# by default, use the $wgUser if s/he is logged-in on this
OpenID-Server-Wiki
# check, if there is an expressed request for a distinct
OpenID-Server-Username
@@ -363,19 +351,6 @@
wfDebug( OpenID: User is logged in\n );
assert( $wgUser-getId() != 0 );
-
-/* pre-version-2.00 behaviour: OpenID Server was only supported
for existing userpages
-
- # Is the user page for the logged-in user?
-
- $user = User::newFromName( $name );
-
- if ( !isset( $user ) ||
- $user-getId() != $wgUser-getId() ) {
- wfDebug( OpenID: User from url not logged in user.\n
);
- return $request-answer( false, $this-serverUrl() );
- }
-*/
# Is the user an OpenID user?
--
To view, visit https://gerrit.wikimedia.org/r/54370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I210eb3fd81fe801d1d6def58beac139e5011bf8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
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 ensure = latest from webserver.pp - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54371
Change subject: Remove ensure = latest from webserver.pp
..
Remove ensure = latest from webserver.pp
Today's Apache security update triggered puppet to update this and break
at least Ganglia.
Change-Id: I3c274c7f0ee7f7fb0d52a02a9918a45def3d49ad
---
M manifests/webserver.pp
1 file changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/54371/1
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 506cabd..d6cc84c 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -9,7 +9,7 @@
firewall
package { lighttpd:
- ensure = latest;
+ ensure = present,
}
service { lighttpd:
@@ -33,12 +33,10 @@
}
class webserver::php5( $ssl = 'false' ) {
- #This will use latest package for php5-common
-
include generic::sysctl::high-http-performance
package { [ apache2, libapache2-mod-php5 ]:
- ensure = latest;
+ ensure = present,
}
if $ssl == 'true' {
@@ -64,7 +62,7 @@
include generic::sysctl::high-http-performance
package { libapache2-mod-proxy-html:
- ensure = latest;
+ ensure = present,
}
}
@@ -75,8 +73,8 @@
include generic::sysctl::high-http-performance
package { php5-mysql:
- ensure = latest;
- }
+ ensure = present,
+ }
}
class webserver::php5-gd {
@@ -84,7 +82,7 @@
include generic::sysctl::high-http-performance
package { php5-gd:
- ensure = latest;
+ ensure = present,
}
}
@@ -94,7 +92,7 @@
include generic::sysctl::high-http-performance
package { apache2:
- ensure = latest;
+ ensure = present,
}
# ensure default site is removed
@@ -108,7 +106,7 @@
# modify to include squid/varnish/nginx ranges depending
# on use.
package { libapache2-mod-rpaf:
- ensure = latest;
+ ensure = present,
}
apache_module { rpaf:
name = rpaf,
@@ -124,7 +122,7 @@
class webserver::apache {
class packages($mpm=prefork) {
package { [apache2, apache2-mpm-${mpm}]:
- ensure = latest;
+ ensure = present,
}
}
@@ -215,7 +213,7 @@
if $packagename {
package { $packagename:
- ensure = latest;
+ ensure = present,;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c274c7f0ee7f7fb0d52a02a9918a45def3d49ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove ensure = latest from webserver.pp - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: Remove ensure = latest from webserver.pp
..
Remove ensure = latest from webserver.pp
Today's Apache security update triggered puppet to update this and break
at least Ganglia.
Change-Id: I3c274c7f0ee7f7fb0d52a02a9918a45def3d49ad
---
M manifests/webserver.pp
1 file changed, 10 insertions(+), 12 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 506cabd..d6cc84c 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -9,7 +9,7 @@
firewall
package { lighttpd:
- ensure = latest;
+ ensure = present,
}
service { lighttpd:
@@ -33,12 +33,10 @@
}
class webserver::php5( $ssl = 'false' ) {
- #This will use latest package for php5-common
-
include generic::sysctl::high-http-performance
package { [ apache2, libapache2-mod-php5 ]:
- ensure = latest;
+ ensure = present,
}
if $ssl == 'true' {
@@ -64,7 +62,7 @@
include generic::sysctl::high-http-performance
package { libapache2-mod-proxy-html:
- ensure = latest;
+ ensure = present,
}
}
@@ -75,8 +73,8 @@
include generic::sysctl::high-http-performance
package { php5-mysql:
- ensure = latest;
- }
+ ensure = present,
+ }
}
class webserver::php5-gd {
@@ -84,7 +82,7 @@
include generic::sysctl::high-http-performance
package { php5-gd:
- ensure = latest;
+ ensure = present,
}
}
@@ -94,7 +92,7 @@
include generic::sysctl::high-http-performance
package { apache2:
- ensure = latest;
+ ensure = present,
}
# ensure default site is removed
@@ -108,7 +106,7 @@
# modify to include squid/varnish/nginx ranges depending
# on use.
package { libapache2-mod-rpaf:
- ensure = latest;
+ ensure = present,
}
apache_module { rpaf:
name = rpaf,
@@ -124,7 +122,7 @@
class webserver::apache {
class packages($mpm=prefork) {
package { [apache2, apache2-mpm-${mpm}]:
- ensure = latest;
+ ensure = present,
}
}
@@ -215,7 +213,7 @@
if $packagename {
package { $packagename:
- ensure = latest;
+ ensure = present,;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c274c7f0ee7f7fb0d52a02a9918a45def3d49ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon fai...@wikimedia.org
Gerrit-Reviewer: Faidon fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 44536, Bug 44968) Use SiteLink instead of Title - change (mediawiki...Wikibase)
Daniel Kinzler has submitted this change and it was merged.
Change subject: (Bug 44536, Bug 44968) Use SiteLink instead of Title
..
(Bug 44536, Bug 44968) Use SiteLink instead of Title
This changeset uses the local names on the namesaces, with the
additional overhead that creates. To avoid some of the trouble
that creates the special page uses a short but important
setSquidMaxage(10).
Patchset 14: Changes according to Daniels wishes
Patchset 15: Rebased
Patchset 16: Some changes to trim and normalize both site and page
Change-Id: I1176f839579f936cecf177310431c1192a74dad8
---
M repo/config/Wikibase.default.php
M repo/config/Wikibase.example.php
M repo/includes/specials/SpecialItemByTitle.php
3 files changed, 32 insertions(+), 24 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 5fbac75..113d418 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -73,3 +73,6 @@
);
$wgWBRepoSettings['multilang-truncate-length'] = 32;
+
+// Should the page names (titles) be normalized against the external site
+$wgWBRepoSettings['normalizeItemByTitlePageNames'] = false;
diff --git a/repo/config/Wikibase.example.php b/repo/config/Wikibase.example.php
index 7103f4b..3956268 100644
--- a/repo/config/Wikibase.example.php
+++ b/repo/config/Wikibase.example.php
@@ -67,13 +67,16 @@
$wgGroupPermissions['wbeditor']['item-set'] = true;
+$wgWBRepoSettings['normalizeItemByTitlePageNames'] = true;
+
+
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) ) {
define( 'WB_NS_QUERY', $baseNs + 4 );
define( 'WB_NS_QUERY_TALK', $baseNs + 5 );
$wgExtraNamespaces[WB_NS_QUERY] = 'Query';
$wgExtraNamespaces[WB_NS_QUERY_TALK] = 'Query_talk';
-
+
$wgWBRepoSettings['entityNamespaces'][CONTENT_MODEL_WIKIBASE_QUERY] =
WB_NS_QUERY;
}
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index e0897f6..c085971 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -56,38 +56,40 @@
// Setup
$request = $this-getRequest();
$parts = ( $subPage === '' ) ? array() : explode( '/',
$subPage, 2 );
- $siteId = $request-getVal( 'site', isset( $parts[0] ) ?
$parts[0] : '' );
- $page = $request-getVal( 'page', isset( $parts[1] ) ?
$parts[1] : '' );
+ $site = trim( $request-getVal( 'site', isset( $parts[0] ) ?
$parts[0] : '' ) );
+ $site = str_replace( '_', ' ', $site );
+ $page = trim( $request-getVal( 'page', isset( $parts[1] ) ?
$parts[1] : '' ) );
+ $page = str_replace( '_', ' ', $page );
- $pageTitle = '';
$itemContent = null;
- if ( !empty( $page ) ) {
- $title = \Title::newFromText( $page );
-
- if ( $title !== null ) {
- $pageTitle = $title-getFullText();
- } else {
- // TODO: throw error, page title contains
invalid chars
- $pageTitle = '';
+ // If ther are enough data, then try to lookup the item content
+ if ( isset( $site ) isset( $page ) ) {
+ // Try to get a item content
+ $siteId = \Wikibase\Utils::trimToNFC( str_replace( '_',
' ', $site ) );
+ $pageName = \Wikibase\Utils::trimToNFC( str_replace(
'_', ' ', $page ) );
+ $itemHandler = new \Wikibase\ItemHandler();
+ $itemContent = $itemHandler-getFromSiteLink( $siteId,
$pageName );
+ // Do we have an item content, and if not can we try
harder?
+ if ( $itemContent === null \Wikibase\Settings::get(
'normalizeItemByTitlePageNames' ) === true ) {
+ // Try harder by requesting normalization on
the external site
+ $site = \SiteSQLStore::newInstance()-getSite(
$siteId );
+ if ( $site instanceof Site ) {
+ $pageName = $site-normalizePageName(
$page );
+ $itemContent =
$itemHandler-getFromSiteLink( $siteId, $pageName );
+ }
}
- // Create an item view
- if ( isset( $siteId ) isset( $pageTitle ) ) {
- $itemHandler = new \Wikibase\ItemHandler();
- $itemContent = $itemHandler-getFromSiteLink(
$siteId, $pageTitle );
-
- if (
[MediaWiki-commits] [Gerrit] Install apache2-mpm-prefork instead of letting APT install -... - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54372
Change subject: Install apache2-mpm-prefork instead of letting APT install
-worker
..
Install apache2-mpm-prefork instead of letting APT install -worker
Change-Id: I6b612e9275b734e1a8556e33cc53e9382cbe9394
---
M manifests/webserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/54372/1
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 506cabd..85a0190 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -37,7 +37,7 @@
include generic::sysctl::high-http-performance
- package { [ apache2, libapache2-mod-php5 ]:
+ package { [ apache2-mpm-prefork, libapache2-mod-php5 ]:
ensure = latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/54372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b612e9275b734e1a8556e33cc53e9382cbe9394
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Remove ensure = latest from webserver.pp - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Revert Remove ensure = latest from webserver.pp
..
Revert Remove ensure = latest from webserver.pp
This reverts commit 34543664fc21bdc8398476e75cde398e5b6a9cd2
Change-Id: I0c51d0bab8afd86ccc98ef7d6ac9641aed07f334
---
M manifests/webserver.pp
1 file changed, 12 insertions(+), 10 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index d6cc84c..506cabd 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -9,7 +9,7 @@
firewall
package { lighttpd:
- ensure = present,
+ ensure = latest;
}
service { lighttpd:
@@ -33,10 +33,12 @@
}
class webserver::php5( $ssl = 'false' ) {
+ #This will use latest package for php5-common
+
include generic::sysctl::high-http-performance
package { [ apache2, libapache2-mod-php5 ]:
- ensure = present,
+ ensure = latest;
}
if $ssl == 'true' {
@@ -62,7 +64,7 @@
include generic::sysctl::high-http-performance
package { libapache2-mod-proxy-html:
- ensure = present,
+ ensure = latest;
}
}
@@ -73,8 +75,8 @@
include generic::sysctl::high-http-performance
package { php5-mysql:
- ensure = present,
- }
+ ensure = latest;
+ }
}
class webserver::php5-gd {
@@ -82,7 +84,7 @@
include generic::sysctl::high-http-performance
package { php5-gd:
- ensure = present,
+ ensure = latest;
}
}
@@ -92,7 +94,7 @@
include generic::sysctl::high-http-performance
package { apache2:
- ensure = present,
+ ensure = latest;
}
# ensure default site is removed
@@ -106,7 +108,7 @@
# modify to include squid/varnish/nginx ranges depending
# on use.
package { libapache2-mod-rpaf:
- ensure = present,
+ ensure = latest;
}
apache_module { rpaf:
name = rpaf,
@@ -122,7 +124,7 @@
class webserver::apache {
class packages($mpm=prefork) {
package { [apache2, apache2-mpm-${mpm}]:
- ensure = present,
+ ensure = latest;
}
}
@@ -213,7 +215,7 @@
if $packagename {
package { $packagename:
- ensure = present,;
+ ensure = latest;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c51d0bab8afd86ccc98ef7d6ac9641aed07f334
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install apache2-mpm-prefork instead of letting APT install -... - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Install apache2-mpm-prefork instead of letting APT install
-worker
..
Install apache2-mpm-prefork instead of letting APT install -worker
Change-Id: I6b612e9275b734e1a8556e33cc53e9382cbe9394
---
M manifests/webserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 506cabd..85a0190 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -37,7 +37,7 @@
include generic::sysctl::high-http-performance
- package { [ apache2, libapache2-mod-php5 ]:
+ package { [ apache2-mpm-prefork, libapache2-mod-php5 ]:
ensure = latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/54372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b612e9275b734e1a8556e33cc53e9382cbe9394
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 34617) all WMF MediaWiki ext to Jenkins - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: (bug 34617) all WMF MediaWiki ext to Jenkins .. (bug 34617) all WMF MediaWiki ext to Jenkins Change-Id: I921a64eaf7a2c60e0b51351570255b0be50ed229 --- M layout.yaml 1 file changed, 964 insertions(+), 27 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 55793b0..dd8a552 100644 --- a/layout.yaml +++ b/layout.yaml @@ -261,11 +261,23 @@ branch: (?!REL1_19) - name: mwext-PHPExcel-jslint voting: true + - name: mwext-ActiveAbstract-jslint +voting: true + - name: mwext-AntiBot-jslint +voting: true + - name: mwext-AntiSpoof-jslint +voting: true + - name: mwext-Calendar-jslint +voting: true - name: mwext-GlobalBlocking-jslint voting: true - name: mwext-Math-jslint voting: true + - name: mwext-TemplateSandbox-jslint +voting: true - name: mwext-Translate-jslint +voting: true + - name: mwext-PostEdit-jslint voting: true - name: mwext-VisualEditor-jslint voting: true @@ -303,6 +315,10 @@ # Has an insert that introduce multiple values, that requires SQLite # version 3.7.11 - name: ^mwext-PageTriage-testextensions-master +voting: false + + # Completely broken test suite + - name: ^mwext-PagedTiffHandler-testextensions-master.* voting: false - name: mediawiki-core-master-phpunit-all @@ -512,6 +528,22 @@ - mwext-AbuseFilter-jslint - mwext-AbuseFilter-lint + - name: mediawiki/extensions/ActiveAbstract +check: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint +test: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint: + - mwext-ActiveAbstract-testextensions-master +gate-and-submit: + - mwext-ActiveAbstract-merge: +- mwext-ActiveAbstract-jslint +- mwext-ActiveAbstract-lint: + - mwext-ActiveAbstract-testextensions-master + - name: mediawiki/extensions/AdminLinks check: - mwext-AdminLinks-merge: @@ -531,6 +563,32 @@ - mwext-Agora-merge: - mwext-Agora-jslint - mwext-Agora-lint + + - name: mediawiki/extensions/AntiBot +check: + - mwext-AntiBot-merge: +- mwext-AntiBot-jslint +- mwext-AntiBot-lint +gate-and-submit: + - mwext-AntiBot-merge: +- mwext-AntiBot-jslint +- mwext-AntiBot-lint + + - name: mediawiki/extensions/AntiSpoof +check: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint +test: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint: + - mwext-AntiSpoof-testextensions-master +gate-and-submit: + - mwext-AntiSpoof-merge: +- mwext-AntiSpoof-jslint +- mwext-AntiSpoof-lint: + - mwext-AntiSpoof-testextensions-master - name: mediawiki/extensions/APC check: @@ -600,6 +658,26 @@ - mwext-BlameMaps-lint - mwext-BlameMaps-pep8 + - name: mediawiki/extensions/Calendar +check: + - mwext-Calendar-merge: +- mwext-Calendar-jslint +- mwext-Calendar-lint +gate-and-submit: + - mwext-Calendar-merge: +- mwext-Calendar-jslint +- mwext-Calendar-lint + + - name: mediawiki/extensions/CategoryTree +check: + - mwext-CategoryTree-merge: +- mwext-CategoryTree-jslint +- mwext-CategoryTree-lint +gate-and-submit: + - mwext-CategoryTree-merge: +- mwext-CategoryTree-jslint +- mwext-CategoryTree-lint + - name: mediawiki/extensions/CharInsert check: - mwext-CharInsert-merge: @@ -619,6 +697,22 @@ - mwext-CheckUser-merge: - mwext-CheckUser-jslint - mwext-CheckUser-lint + + - name: mediawiki/extensions/Cite +check: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint +test: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint: + - mwext-Cite-testextensions-master +gate-and-submit: + - mwext-Cite-merge: +- mwext-Cite-jslint +- mwext-Cite-lint: + - mwext-Cite-testextensions-master - name: mediawiki/extensions/cldr check: @@ -667,6 +761,62 @@ - mwext-CleanChanges-jslint - mwext-CleanChanges-lint + - name: mediawiki/extensions/ClickTracking +check: + - mwext-ClickTracking-merge: +- mwext-ClickTracking-jslint +- mwext-ClickTracking-lint +gate-and-submit: + - mwext-ClickTracking-merge: +- mwext-ClickTracking-jslint +- mwext-ClickTracking-lint + + - name: mediawiki/extensions/ClientSide +check: + - mwext-ClientSide-merge: +- mwext-ClientSide-jslint +-
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ActiveAbstract)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54374 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I45826631ab1292a16f66a17beff46f924e26c568 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ActiveAbstract refs/changes/74/54374/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45826631ab1292a16f66a17beff46f924e26c568 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ActiveAbstract Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...AntiBot)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54375 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I2575e6732d23424b48fc9e5e6cf9548b561a2d03 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiBot refs/changes/75/54375/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2575e6732d23424b48fc9e5e6cf9548b561a2d03 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiBot Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...AntiSpoof)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54376 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ic7a69b30b7f746b38556cf240e17a157c239602f --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof refs/changes/76/54376/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7a69b30b7f746b38556cf240e17a157c239602f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Calendar)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54377 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I84ae96332a1422d1f198390c4b2fdd6eeb2bc39f --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Calendar refs/changes/77/54377/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84ae96332a1422d1f198390c4b2fdd6eeb2bc39f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Calendar Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CategoryTree)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54378 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ic4accd84110ff97c1cafa5d7f588092965106aa1 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree refs/changes/78/54378/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4accd84110ff97c1cafa5d7f588092965106aa1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CategoryTree Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Cite)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54379 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I256eeed4f09cca8d5963ec3cf6afa5ef26f8e8e4 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/79/54379/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I256eeed4f09cca8d5963ec3cf6afa5ef26f8e8e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ClickTracking)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54380 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ic54f699967b990088a62a519a1a6cc864ccfd523 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ClickTracking refs/changes/80/54380/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic54f699967b990088a62a519a1a6cc864ccfd523 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ClickTracking Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ClientSide)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54381 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0d898bff04f04e6e5dd8bdd0480c3eb27e30346a --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ClientSide refs/changes/81/54381/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d898bff04f04e6e5dd8bdd0480c3eb27e30346a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ClientSide Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CodeEditor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54382 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I2954ea807c547c2a81f6558475c39e28dba9d132 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor refs/changes/82/54382/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2954ea807c547c2a81f6558475c39e28dba9d132 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeEditor Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CodeReview)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54383 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I09a0bdb92f638dec74847a9ccc9d5e25dc7a3471 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview refs/changes/83/54383/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09a0bdb92f638dec74847a9ccc9d5e25dc7a3471 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeReview Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Collection)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54384 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I1bdd9e4498d8840f5cb5200a3edc165b66b24f2c --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection refs/changes/84/54384/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bdd9e4498d8840f5cb5200a3edc165b66b24f2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix dependency - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54385
Change subject: Fix dependency
..
Fix dependency
Change-Id: I6d9da824d212d80c9758c79cccdb19ee1a16140a
---
M manifests/webserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/54385/1
diff --git a/manifests/webserver.pp b/manifests/webserver.pp
index 85a0190..d9bb845 100644
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -46,7 +46,7 @@
}
service { apache2:
- require = Package[apache2],
+ require = Package[apache2-mpm-prefork],
subscribe = Package[libapache2-mod-php5],
ensure = running;
}
--
To view, visit https://gerrit.wikimedia.org/r/54385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d9da824d212d80c9758c79cccdb19ee1a16140a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CommunityApplications)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54386 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I01c7bcb6a7b2bdcc360eddbc1a4c20c7ff3278be --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommunityApplications refs/changes/86/54386/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01c7bcb6a7b2bdcc360eddbc1a4c20c7ff3278be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommunityApplications Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CommunityHiring)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54387 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I3854cd44ec4ceb51642b374064b610e13fdcd8ec --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommunityHiring refs/changes/87/54387/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3854cd44ec4ceb51642b374064b610e13fdcd8ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommunityHiring Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CommunityVoice)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54388 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I1bf3b55b4c76b80bf8f0e6d13ceab5d4ef1fb108 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommunityVoice refs/changes/88/54388/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bf3b55b4c76b80bf8f0e6d13ceab5d4ef1fb108 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommunityVoice Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ContactPage)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54389 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0c4f68c38c3afda7d3f0a0a27de53bd233f661b0 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContactPage refs/changes/89/54389/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c4f68c38c3afda7d3f0a0a27de53bd233f661b0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPage Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ContactPageFundraiser)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54390 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I8fd6bd4c286035afb35ec10c702d7a71df876c88 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContactPageFundraiser refs/changes/90/54390/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fd6bd4c286035afb35ec10c702d7a71df876c88 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPageFundraiser Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ContributionReporting)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54391 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I17e4788b4a7766c11e04a3e19f4428a59e81c632 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributionReporting refs/changes/91/54391/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54391 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17e4788b4a7766c11e04a3e19f4428a59e81c632 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContributionReporting Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ContributionTracking)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54392 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I456a681271c7129deca275a49ac1653b4946 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributionTracking refs/changes/92/54392/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I456a681271c7129deca275a49ac1653b4946 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContributionTracking Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CreditsSource)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54393 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ib70eb73c5ffadd083c248221b4d142447fc666e9 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreditsSource refs/changes/93/54393/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib70eb73c5ffadd083c248221b4d142447fc666e9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CreditsSource Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CustomData)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54394 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ib8c328903bd3df86908a9af2539316bb352de220 --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CustomData refs/changes/94/54394/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8c328903bd3df86908a9af2539316bb352de220 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CustomData Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CustomUserSignup)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54395 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Ie225a3448785e99686906219281726aa1120666c --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CustomUserSignup refs/changes/95/54395/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/54395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie225a3448785e99686906219281726aa1120666c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CustomUserSignup Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
