[MediaWiki-commits] [Gerrit] Improve explanation in comment. - change (mediawiki...Agora)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/56895 Change subject: Improve explanation in comment. .. Improve explanation in comment. Change-Id: Ie9147f818e87747d22da4b8f1d65c6092be97ca0 --- M modules/css/mediawiki.ui.default.css M modules/css/mediawiki.ui.vector.css M modules/scss/mediawiki.ui.default.scss M modules/scss/mediawiki.ui.vector.scss 4 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Agora refs/changes/95/56895/1 diff --git a/modules/css/mediawiki.ui.default.css b/modules/css/mediawiki.ui.default.css index 14c2a90..1d15f36 100644 --- a/modules/css/mediawiki.ui.default.css +++ b/modules/css/mediawiki.ui.default.css @@ -1,4 +1,9 @@ -/* Agora styles */ +/** + * Provide Agora appearance for mw-ui-* classes when using a skin other than + * Vector. + * Compass builds these Agora styles from source Sass files in + * extensions/Agora/modules/sccs + */ /* _effects.scss */ /* Mixins for visual effects in CSS3 */ /* line 7, ../scss/components/_utilities.scss */ diff --git a/modules/css/mediawiki.ui.vector.css b/modules/css/mediawiki.ui.vector.css index 41e1c1c..05da2a0 100644 --- a/modules/css/mediawiki.ui.vector.css +++ b/modules/css/mediawiki.ui.vector.css @@ -1,4 +1,8 @@ -/* Agora styles */ +/** + * Provide Agora appearance for mw-ui-* classes when using the Vector skin. + * Compass builds these Agora styles from source Sass files in + * extensions/Agora/modules/sccs + */ /* _effects.scss */ /* Mixins for visual effects in CSS3 */ /* line 7, ../scss/components/_utilities.scss */ diff --git a/modules/scss/mediawiki.ui.default.scss b/modules/scss/mediawiki.ui.default.scss index 5f39cf9..6088333 100644 --- a/modules/scss/mediawiki.ui.default.scss +++ b/modules/scss/mediawiki.ui.default.scss @@ -1,4 +1,9 @@ -/* Agora styles */ +/** + * Provide Agora appearance for mw-ui-* classes when using a skin other than + * Vector. + * Compass builds these Agora styles from source Sass files in + * extensions/Agora/modules/sccs + */ @charset "UTF-8"; @@ -8,4 +13,4 @@ @import "mixins/all"; -@import "components/default"; \ No newline at end of file +@import "components/default"; diff --git a/modules/scss/mediawiki.ui.vector.scss b/modules/scss/mediawiki.ui.vector.scss index e7b4c02..9b13002 100644 --- a/modules/scss/mediawiki.ui.vector.scss +++ b/modules/scss/mediawiki.ui.vector.scss @@ -1,4 +1,8 @@ -/* Agora styles */ +/** + * Provide Agora appearance for mw-ui-* classes when using the Vector skin. + * Compass builds these Agora styles from source Sass files in + * extensions/Agora/modules/sccs + */ @charset "UTF-8"; @@ -8,4 +12,4 @@ @import "mixins/all"; -@import "components/vector"; \ No newline at end of file +@import "components/vector"; -- To view, visit https://gerrit.wikimedia.org/r/56895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9147f818e87747d22da4b8f1d65c6092be97ca0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Agora Gerrit-Branch: master Gerrit-Owner: Spage ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 44210) Use the same user name for posting to all wikis - change (mediawiki...TranslationNotifications)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/56896 Change subject: (bug 44210) Use the same user name for posting to all wikis .. (bug 44210) Use the same user name for posting to all wikis Change-Id: I4f8d5131e748f385e8b938b5c98551210d9ff609 --- M TranslationNotificationJob.php 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications refs/changes/96/56896/1 diff --git a/TranslationNotificationJob.php b/TranslationNotificationJob.php index b8942ae..177b18c 100644 --- a/TranslationNotificationJob.php +++ b/TranslationNotificationJob.php @@ -59,13 +59,14 @@ $text = $textContent . "\n" . $text; } - $editor = User::newFromID( $this->params['editor'] ); + + global $wgNotificationUsername; $status = $talkPage->doEditContent( ContentHandler::makeContent( $text, $this->title ), $this->params['editSummary'], $flags, false, - $editor + User::newFromName( $wgNotificationUsername ) ); return $status->isGood(); -- To view, visit https://gerrit.wikimedia.org/r/56896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f8d5131e748f385e8b938b5c98551210d9ff609 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TranslationNotifications Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for math multiple params - change (mediawiki...Foxway)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56897
Change subject: fix for math multiple params
..
fix for math multiple params
fix for failed test function testRun_echo_math_params()
echo '10 + 5 * 5 = ', 10 + 5 * 5, "\n\n";
Change-Id: I8638fa21bbe373b90cd80c3a4abf7587416da3dc
---
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
3 files changed, 35 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway
refs/changes/97/56897/1
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index bf592c0..58ad48e 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -69,6 +69,9 @@
$expectQuotesClose = true;
$expected =
array(T_ENCAPSED_AND_WHITESPACE, T_CURLY_OPEN, T_VARIABLE, '"');
}
+ if($expectListParams){
+ $expected[] = ',';
+ }
break;
case ';':
$return .=
$runtime->getCommandResult($debug);
@@ -128,7 +131,7 @@
T_VARIABLE,
T_CURLY_OPEN,
'"',
- ';',
+ //';',
);
} else {
$return .= '' . wfMessage( 'foxway-php-syntax-error-unexpected', '\' } \'',
$line )->escaped() . '';
@@ -180,6 +183,9 @@
}
$runtime->addParam( $text );
$expected = array(';', '.', '+', '-',
'*', '/');
+ if($expectListParams){
+ $expected[] = ',';
+ }
break;
case T_ENCAPSED_AND_WHITESPACE:
if($is_debug) {
diff --git a/includes/Runtime.php b/includes/Runtime.php
index caca417..b13ab6c 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -52,28 +52,35 @@
switch ( $this->lastOperator ) {
case '.':
$this->lastParam .= $param;
- $this->lastOperator = false;
break;
case '*':
$this->lastParam *= $param;
- $this->lastOperator = false;
break;
case '/':
$this->lastParam /= $param;
- $this->lastOperator = false;
break;
case '+':
case '-':
$this->mathMemory =
array($this->lastParam, $this->lastOperator);
$this->lastParam = $param;
- $this->lastOperator = false;
break;
default:
// TODO
\MWDebug::log( 'Error! Unknown operator
"' . htmlspecialchars($this->lastOperator) . '" in ' . __METHOD__ );
break;
}
+ $this->lastOperator = false;
} else {
+ if( $this->mathMemory ) {
+ if( $this->mathMemory[1] == '+' ) {
+ $this->lastParam = $this->mathMemory[0]
+ $this->lastParam;
+ } elseif ( $this->mathMemory[1] == '-' ) {
+ $this->lastParam = $this->mathMemory[0]
- $this->lastParam;
+ } else { // $this->mathMemory[1] == '.'
+ $this->lastParam = $this->mathMemory[0]
. $this->lastParam;
+ }
+ $this->mathMemory = false;
+ }
if( !is_null($this->lastParam) ) {
[MediaWiki-commits] [Gerrit] fix for math multiple params - change (mediawiki...Foxway)
Pastakhov has submitted this change and it was merged.
Change subject: fix for math multiple params
..
fix for math multiple params
fix for failed test function testRun_echo_math_params()
echo '10 + 5 * 5 = ', 10 + 5 * 5, "\n\n";
Change-Id: I8638fa21bbe373b90cd80c3a4abf7587416da3dc
---
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
3 files changed, 35 insertions(+), 7 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index bf592c0..58ad48e 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -69,6 +69,9 @@
$expectQuotesClose = true;
$expected =
array(T_ENCAPSED_AND_WHITESPACE, T_CURLY_OPEN, T_VARIABLE, '"');
}
+ if($expectListParams){
+ $expected[] = ',';
+ }
break;
case ';':
$return .=
$runtime->getCommandResult($debug);
@@ -128,7 +131,7 @@
T_VARIABLE,
T_CURLY_OPEN,
'"',
- ';',
+ //';',
);
} else {
$return .= '' . wfMessage( 'foxway-php-syntax-error-unexpected', '\' } \'',
$line )->escaped() . '';
@@ -180,6 +183,9 @@
}
$runtime->addParam( $text );
$expected = array(';', '.', '+', '-',
'*', '/');
+ if($expectListParams){
+ $expected[] = ',';
+ }
break;
case T_ENCAPSED_AND_WHITESPACE:
if($is_debug) {
diff --git a/includes/Runtime.php b/includes/Runtime.php
index caca417..b13ab6c 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -52,28 +52,35 @@
switch ( $this->lastOperator ) {
case '.':
$this->lastParam .= $param;
- $this->lastOperator = false;
break;
case '*':
$this->lastParam *= $param;
- $this->lastOperator = false;
break;
case '/':
$this->lastParam /= $param;
- $this->lastOperator = false;
break;
case '+':
case '-':
$this->mathMemory =
array($this->lastParam, $this->lastOperator);
$this->lastParam = $param;
- $this->lastOperator = false;
break;
default:
// TODO
\MWDebug::log( 'Error! Unknown operator
"' . htmlspecialchars($this->lastOperator) . '" in ' . __METHOD__ );
break;
}
+ $this->lastOperator = false;
} else {
+ if( $this->mathMemory ) {
+ if( $this->mathMemory[1] == '+' ) {
+ $this->lastParam = $this->mathMemory[0]
+ $this->lastParam;
+ } elseif ( $this->mathMemory[1] == '-' ) {
+ $this->lastParam = $this->mathMemory[0]
- $this->lastParam;
+ } else { // $this->mathMemory[1] == '.'
+ $this->lastParam = $this->mathMemory[0]
. $this->lastParam;
+ }
+ $this->mathMemory = false;
+ }
if( !is_null($this->lastParam) ) {
$this->listParams[] = $this->lastParam;
[MediaWiki-commits] [Gerrit] Fix PHPDoc comments - change (mediawiki...AbuseFilter)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56898
Change subject: Fix PHPDoc comments
..
Fix PHPDoc comments
Change-Id: I7d6da503d909d06b9a10cb55144852e1c4d07569
---
M AbuseFilter.class.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/98/56898/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 7f4e7b5..d4a408d 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -893,6 +893,7 @@
* @param $log_template
* @param $action
* @param $vars AbuseFilterVariableHolder
+* @param string $group
* @return mixed
*/
public static function addLogEntries( $actions_taken, $log_template,
$action, $vars, $group = 'default' ) {
@@ -1937,8 +1938,8 @@
}
/**
-* @param $title Title
-* @param $article Page|null
+* @param Title $title
+* @param null|Page $page
* @return AbuseFilterVariableHolder
*/
public static function getEditVars( $title, Page $page = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/56898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d6da503d909d06b9a10cb55144852e1c4d07569
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace 2 deprecated methods - change (mediawiki...AbuseFilter)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56899
Change subject: Replace 2 deprecated methods
..
Replace 2 deprecated methods
Change-Id: I8e420f0259ef6c9e579f7a00beb58f28af9da37d
---
M AbuseFilterVariableHolder.php
M special/SpecialAbuseLog.php
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/99/56899/1
diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index 812712a..2c43451 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -352,13 +352,14 @@
$article = $parameters['article'];
if ( $article !== null
&& ( !defined(
'MW_SUPPORTS_CONTENTHANDLER' )
- || $article->getContentModel()
=== CONTENT_MODEL_WIKITEXT ) ) {
-
+ || $article->getContentModel()
=== CONTENT_MODEL_WIKITEXT )
+ ) {
$textVar = $parameters['text-var'];
// XXX: Use prepareContentForEdit. But
we need a Content object for that.
$new_text = $vars->getVar( $textVar
)->toString();
- $editInfo =
$article->prepareTextForEdit( $new_text );
+ $content = ContentHandler::makeContent(
$new_text, $article->getTitle() );
+ $editInfo =
$article->prepareContentForEdit( $content );
$links = array_keys(
$editInfo->output->getExternalLinks() );
$result = $links;
break;
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 38a0f15..2774c27 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -308,7 +308,7 @@
$diffEngine = new DifferenceEngine;
$diffEngine->showDiffStyle();
- $formattedDiff = $diffEngine->generateDiffBody(
$old_wikitext, $new_wikitext );
+ $formattedDiff = $diffEngine->generateTextDiffBody(
$old_wikitext, $new_wikitext );
static $colDescriptions = "
--
To view, visit https://gerrit.wikimedia.org/r/56899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e420f0259ef6c9e579f7a00beb58f28af9da37d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove leading spaces in two messages - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56900
Change subject: Remove leading spaces in two messages
..
Remove leading spaces in two messages
Also replace two hard coded space by a word separator.
Spotter by 아라 in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Upload_source_url/en
Change-Id: If3fbe2ed9b2bd7e156cc31055e9c74da3d79240a
---
M includes/specials/SpecialUpload.php
M languages/messages/MessagesEn.php
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/00/56900/1
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 89c06b2..b665c4b 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -843,10 +843,13 @@
'upload-type' => 'File',
'radio' => &$radio,
'help' => $this->msg( 'upload-maxfilesize',
-
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['file'] )
- )->parse() . ' ' . $this->msg(
'upload_source_file' )->escaped(),
+ $this->getContext()->getLanguage()->formatSize(
$this->mMaxUploadSize['file'] ) )
+ ->parse() .
+ $this->msg( 'word-separator' )->escaped() .
+ $this->msg( 'upload_source_file' )->escaped(),
'checked' => $selectedSourceType == 'file',
);
+
if ( $canUploadByUrl ) {
$this->mMaxUploadSize['url'] =
UploadBase::getMaxUploadSize( 'url' );
$descriptor['UploadFileURL'] = array(
@@ -857,8 +860,10 @@
'upload-type' => 'url',
'radio' => &$radio,
'help' => $this->msg( 'upload-maxfilesize',
-
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] )
- )->parse() . ' ' . $this->msg(
'upload_source_url' )->escaped(),
+
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] ) )
+ ->parse() .
+ $this->msg( 'word-separator'
)->escaped() .
+ $this->msg( 'upload_source_url'
)->escaped(),
'checked' => $selectedSourceType == 'url',
);
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 9de6aaf..d95f195 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2414,8 +2414,8 @@
'nolicense' => 'None selected',
'licenses' => '-', # do not translate or duplicate this message to
other languages
'license-nopreview' => '(Preview not available)',
-'upload_source_url' => ' (a valid, publicly accessible URL)',
-'upload_source_file' => ' (a file on your computer)',
+'upload_source_url' => '(a valid, publicly accessible URL)',
+'upload_source_file' => '(a file on your computer)',
# Special:ListFiles
'listfiles-summary' => 'This special page shows all uploaded files.
--
To view, visit https://gerrit.wikimedia.org/r/56900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3fbe2ed9b2bd7e156cc31055e9c74da3d79240a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove wrong RL module - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Remove wrong RL module .. Remove wrong RL module ext.translate.grid was removed in favor of jquery.uls.grid in I82a1fff167d3be0b7f240066a1ca52b5ee473135 Change-Id: Ia76276deff17a4812e2c98342a2862b0c156fd71 --- M specials/SpecialSearchTranslations.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/specials/SpecialSearchTranslations.php b/specials/SpecialSearchTranslations.php index 2873a84..4b88136 100644 --- a/specials/SpecialSearchTranslations.php +++ b/specials/SpecialSearchTranslations.php @@ -52,7 +52,6 @@ } $out = $this->getOutput(); - $out->addModules( 'ext.translate.grid' ); $out->addModules( 'ext.translate.special.searchtranslations' ); $this->opts = $opts = new FormOptions(); -- To view, visit https://gerrit.wikimedia.org/r/56891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia76276deff17a4812e2c98342a2862b0c156fd71 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Santhosh Gerrit-Reviewer: Amire80 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 unused variables and globals - change (mediawiki...OpenID)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56901
Change subject: Remove unused variables and globals
..
Remove unused variables and globals
Also remove superfluous newlines, update some formatting and simplify two
if() statements.
Change-Id: Ie23d9cb0445bb113fddd7223af7858be97bf5890
---
M SpecialOpenIDIdentifier.body.php
M SpecialOpenIDLogin.body.php
M SpecialOpenIDServer.body.php
3 files changed, 16 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/01/56901/1
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index d8270c4..48b8982 100644
--- a/SpecialOpenIDIdentifier.body.php
+++ b/SpecialOpenIDIdentifier.body.php
@@ -24,7 +24,6 @@
*/
class SpecialOpenIDIdentifier extends unlistedSpecialPage {
-
function __construct() {
parent::__construct( 'OpenIDIdentifier' );
}
@@ -39,7 +38,6 @@
}
self::showOpenIDIdentifier( User::newFromId( $par ), false,
true );
-
}
private static function isUser( $user ) {
@@ -47,21 +45,20 @@
}
/**
-* @param $user User
-* @param $delegate bool
+* @param User $user
+* @param bool $delegate
+* @param bool $showSpecialPageText
*/
public static function showOpenIDIdentifier( $user, $delegate = false,
$showSpecialPageText = false ) {
global $wgOut, $wgUser, $wgOpenIDClientOnly,
$wgOpenIDShowUrlOnUserPage,
- $wgOpenIDAllowServingOpenIDUserAccounts,
$wgOpenIDIdentifiersURL;
+ $wgOpenIDAllowServingOpenIDUserAccounts;
// show the own OpenID Url as a subtitle on the user page
// but only for the user when visiting their own page
// and when the options say so
- if ( !self::isUser( $user ) ) {
- if ( $showSpecialPageText ) {
- $wgOut->addWikiMsg(
'openid-identifier-page-text-no-such-local-openid' );
- }
+ if ( !self::isUser( $user ) && $showSpecialPageText ) {
+ $wgOut->addWikiMsg(
'openid-identifier-page-text-no-such-local-openid' );
return;
}
@@ -69,11 +66,10 @@
# Add OpenID data if its allowed
if ( !$wgOpenIDClientOnly ) {
-
if ( !( count( $openid )
&& ( strlen( $openid[0]->uoi_openid ) != 0 )
- && !$wgOpenIDAllowServingOpenIDUserAccounts ) )
{
-
+ && !$wgOpenIDAllowServingOpenIDUserAccounts )
+ ) {
$serverTitle = SpecialPage::getTitleFor(
'OpenIDServer' );
$serverUrl = $serverTitle->getFullURL();
$wgOut->addLink( array( 'rel' =>
'openid.server', 'href' => $serverUrl ) );
@@ -93,8 +89,8 @@
if ( ( $user->getID() === $wgUser->getID() )
&& ( $user->getID() != 0 )
&& ( $wgOpenIDShowUrlOnUserPage === 'always'
- || ( ( $wgOpenIDShowUrlOnUserPage ===
'user' ) && !$wgUser->getOption( 'openid-hide-openid' ) ) ) ) {
-
+ || ( ( $wgOpenIDShowUrlOnUserPage ===
'user' ) && !$wgUser->getOption( 'openid-hide-openid' ) ) )
+ ) {
$wgOut->setSubtitle( "" .
OpenIDHooks::getOpenIDSmallLogoUrlImageTag() .
SpecialOpenIDServer::getLocalIdentityLink( $wgUser ) .
@@ -103,17 +99,9 @@
if ( $showSpecialPageText ) {
$wgOut->addWikiMsg(
'openid-identifier-page-text-user', $wgUser->getName() );
}
-
- } else {
-
- if ( $showSpecialPageText ) {
- $wgOut->addWikiMsg(
'openid-identifier-page-text-different-user', $user->getID() );
- }
-
+ } elseif ( $showSpecialPageText ) {
+ $wgOut->addWikiMsg(
'openid-identifier-page-text-different-user', $user->getID() );
}
-
}
-
}
-
}
diff --git a/SpecialOpenIDLogin.body.php b/SpecialOpenIDLogin.body.php
index c182304..e6cf136 100644
--- a/SpecialOpenIDLogin.body.php
+++ b/SpecialOpenIDLogin.body.php
@@ -163,6 +163,7 @@
*
* @param $openid String: OpenID url
* @param $sreg Array: options get from OpenID
+* @param $ax
[MediaWiki-commits] [Gerrit] Fixed segfault - change (analytics/webstatscollector)
Stefan.petrea has uploaded a new change for review. https://gerrit.wikimedia.org/r/56902 Change subject: Fixed segfault .. Fixed segfault Change-Id: I63871716ade4cc657720ad42ef03c6fd7741fceb --- A big-entry-1.txt M filter.c M test.sh 3 files changed, 21 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/webstatscollector refs/changes/02/56902/1 diff --git a/big-entry-1.txt b/big-entry-1.txt new file mode 100644 index 000..b92f0f3 --- /dev/null +++ b/big-entry-1.txt @@ -0,0 +1 @@ +amssq46.esams.wikimedia.org 183925014 2013-03-26T18:42:47.309 316 0.0.0.0 TCP_MISS/2002646GET http://es.wikipedia.org/w/api.php?action=query&prop=revisions&rvprop=content&titles=TKRBeneficioDif(%)IngresosDif(%)BPAEBITDAPeriodoPrevisionesNoticiaA3TV3190658074110-80001539504T12VerVerABE10240042304039003201262459004T12VerVerABG12540-5100778300979023--4T12VerVerACS-196200--28472003490-6463088004T12VerVerACX-1832--455500-250-007197604T12VerVerADV1420--115500350011548004T12VerVerALB-29940---508--4T12VerVerALM7640-93090020310045124004T12VerVerAMA5751018002910007501131107704T12VerVerAMP-24571949034800-1100-0759604T12VerVerANA18940-6277016005603151431004T12VerVerAZK1101750011890-350003--4T12VerVerBAY97100-8404T12VerVerBBVA167600-4420031--4T12VerVerBDL183481008070-22039134704T12VerVerBIO-092-77501629400660-0022279004T12VerVerBKIA-1919300287403153003020-990--4T12VerVerBKT12470-3120023--4T12VerVerBME13550-127029620-780170197304T12VerVerBVA-3630586-101--4T12VerVerCABK23000-7820024--4T12VerVerCAF9940-3200172100--2916181904T12VerVerCBAV-540--9000-4000199604T12VerVerCDR-10460--1663902110-190305204T12VerVerCIE6100070156250-660051234104T12VerVerCLEO-129035005300-1850132--4T12VerVerCOL-112900--22500-200-420175004T12VerVerCPF1570--191830498-024150504T12VerVerCPL-14710550065370-1290-38669804T12VerVerCUN1027-9193504-4514T12VerVerDERM1100-59002900-1940-145-11704T12VerVerDIA1579060401167900670024609504T12VerVerDIN2620--11027604T12VerVerEAD1228001900564800015001502186004T12VerVerEBRO158404602041001310107299504T12VerVerECR-121313970066750-120-012677504T12VerVerELE203400-80033933003801927005004T12VerVerENC430040082800030012139004T12VerVerENEL41300120268800640--1678004T12VerVerENG37950410114040400159934304T12VerVerENO8760-2390193100320135263704T12VerVerEZE-1945-510019040-040-00910284T12VerVerFAE195037001761074001021354T12VerVerFCC-102800--1115200-630-707753004T12VerVerFDR1450-39062880080-11572204T12VerVerFER70970-4290768640320051926804T12VerVerFRS-6898-32604460400-05031904T12VerVerFUN100--12030318--4T12VerVerGALQ6100-500014000-3100--14504T12VerVerGAM-65900--284400-620-018--4T12VerVerGAS144100880249040018201465080004T12VerVerGCO20020-490323680050165--4T12VerVerGRF25670410302620904600--836104T12VerVerGSJ-9900--65800-1250-14987004T12VerVerIAG-92300--15372001390---68004T12VerVerIBE2840701303428100477726604T12VerVerIBG1740-23802161010017733004T12VerVerIDR13270-2700294100900080249004T12VerVerINSUR-1807--51411960--12304T12VerVerINY-493-36003476-900-0170934T12VerVerITX2361002200159460015003793913004T12VerVerJAZ62002200908602100025172704T12VerVerLGT026-91965590-2235174T12VerVerMAP66570-31002530120750022--4T12VerVerMCM274018401990041021752814T12VerVerMDF116001630916001440072126304T12VerVerMEL4210030136240200023249504T12VerVerMTBA-2910--880-5260-024--4T12VerVerMTF-58200-03016040-1100-464-7704T12VerVerMTS-274600--6219593-1040--5717964T12VerVerMVC-26930862025780-2610-027121604T12VerVerNAT-440041035500--012--4T12VerVerNEA700--3170-5000-058-4304T12VerVerNHH-29210--131010-340-1185504T12VerVerNTC-602993150--0864T12VerVerOHL100550350304029008809661052904T12VerVerOLE-24500--82880-1370--88304T12VerVerPAC1429-65009802030001690054T12VerVerPOP-246100---023--4T12VerVerPRM9203728866-30405715114T12VerVerPRS-1282--266400-220-061476004T12VerVerPSG172002703669003060028427004T12VerVerQBT-7670-2000361606900-008-11804T12VerVerR454919603700150013--4T12VerVerREE492286901755207203641299104T12VerVerREN36010005250-65000236204T12VerVerREP206000-610595930013201756956004T12VerVerREY-910001427013600-4920-174-709304T12VerVerRIO0741911673390014--4T12VerVerRLIA-31900--21700-2260-007124104T12VerVerROVI19508002019090003927004T12VerVerSAB8190-6470006--4T12VerVerSAN220500-5880024--4T12VerVerSED1337017000117400013-36924804T12VerVerSLR-2400-75001690-8380-0246504T12VerVerSNC-2160--12670-1120-009-4504T12VerVerSPS-1820-543020960-410-0296374T12VerVerSTG35201040-15114404T12VerVerSYV-97700--361370-574-565506004T12VerVerTEC-410--38500-300--4504T12VerVerTEF392800-27306235600-08008821231004T12VerVerTL55014-546088670-121001164904T12VerVerTRE13630090265650150240157004T12VerVerTUB1180224005324094000945784T12VerVerTVX91336304047440-890-07841264T12VerVerURA-4300592062100-800-01856004T12VerVerVER-4060-16609120-3560-0135704T12VerVerVID46506404569055019365304T12VerVerVIS1050038075280129022524604T12VerVerVLG28301730110200
[MediaWiki-commits] [Gerrit] Reformat code - change (mediawiki...OpenID)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56903
Change subject: Reformat code
..
Reformat code
Also remove unneeded else{} in getOpenIDSmallLogoUrl().
Change-Id: I9c95f5462cb74c50f98323a635f27d4fac9c1c18
---
M OpenID.hooks.php
1 file changed, 107 insertions(+), 127 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/03/56903/1
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 43bf548..98dcf82 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -10,6 +10,7 @@
parent::__construct( 'SpecialOpenIDCreateAccount',
'OpenIDLogin' );
}
}
+
class SpecialOpenIDUserLogin extends SpecialRedirectToSpecial {
function __construct() {
parent::__construct( 'SpecialOpenIDUserLogin', 'OpenIDLogin',
false, array( 'returnto', 'returntoquery' ) );
@@ -64,10 +65,10 @@
/* pre-version-2.00 behaviour: OpenID Server was only supported
for existing userpages */
- if ( $nt
+ if ( $nt
&& ( $nt->getNamespace() == NS_USER )
- && ( strpos( $nt->getText(), '/' ) === false ) ) {
-
+ && ( strpos( $nt->getText(), '/' ) === false )
+ ) {
$user = User::newFromName( $nt->getText() );
if ( $user && ( $user->getID() != 0 ) ) {
@@ -138,8 +139,8 @@
$rows = '';
foreach ( $openid_urls_registration as $url_reg ) {
-
- if ( !empty( $url_reg->uoi_user_registration ) ) {
+
+ if ( !empty( $url_reg->uoi_user_registration ) ) {
$registrationTime = wfMessage(
'openid-urls-registration-date-time',
$wgLang->timeanddate(
$url_reg->uoi_user_registration, true ),
@@ -157,32 +158,32 @@
" " .
Xml::element( 'a', array(
'href' => $url_reg->uoi_openid ), $url_reg->uoi_openid )
) .
- Xml::tags( 'td',
- array(),
- $registrationTime
- ) .
- Xml::tags( 'td',
- array(),
- Linker::link( $delTitle, wfMessage(
'openid-urls-delete' )->text(),
+ Xml::tags( 'td',
array(),
- array( 'url' =>
$url_reg->uoi_openid )
- )
- )
+ $registrationTime
+ ) .
+ Xml::tags( 'td',
+ array(),
+ Linker::link( $delTitle,
wfMessage( 'openid-urls-delete' )->text(),
+ array(),
+ array( 'url' =>
$url_reg->uoi_openid )
+ )
+ )
) . "\n";
}
$info = Xml::tags( 'table', array( 'class' => 'wikitable' ),
Xml::tags( 'tr', array(),
Xml::element( 'th',
- array(),
+ array(),
wfMessage( 'openid-urls-url' )->text()
) .
- Xml::element( 'th',
- array(),
- wfMessage( 'openid-urls-registration'
)->text() ) .
- Xml::element( 'th',
- array(),
- wfMessage( 'openid-urls-action'
)->text() )
- ) . "\n" .
- $rows
+ Xml::element( 'th',
+ array(),
+ wfMessage(
'openid-urls-registration' )->text() ) .
+ Xml::element( 'th',
+ array(),
+ wfMessage( 'openid-urls-action'
)->text() )
+ ) . "\n" .
+ $rows
);
$info .= Linker::link(
[MediaWiki-commits] [Gerrit] fix for math with variables - change (mediawiki...Foxway)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56904
Change subject: fix for math with variables
..
fix for math with variables
fix for failed test function testRun_echo_math_variables()
echo "\$foo * \$bar = $foo * $bar = ", $foo * $bar, "\n\n";
Change-Id: I162e218cf308b7b97f0affc8ba0fc6d785010e9d
---
M includes/Interpreter.php
M tests/phpunit/includes/InterpreterTest.php
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway
refs/changes/04/56904/1
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 58ad48e..0f2d4ba 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -192,7 +192,6 @@
$debug[] = '' .
htmlspecialchars($text) . '';
}
$runtime->addParam(
self::process_slashes($text, false) );
- $runtime->addOperator('.');
break;
case T_VARIABLE:
if( $expected && in_array(T_VARIABLE,
$expected) ) {
@@ -256,8 +255,8 @@
$pattern = array('/()*+\'/', '//');
$replacement = array('$1\'', '\\');
} else {
- //
(\\)*+\"\n \r
\t \v \$ \\
- $pattern = array('/()*+"/', '/n/',
'/r/', '/t/', '/v/', '/$/', '//');
+ //
(\\)*+\"(\\)*+\n
(\\)*+\r(\\)*+\t
(\\)*+\v(\\)*+\$\\
+ $pattern = array('/()*+"/',
'/()*+n/', '/()*+r/', '/()*+t/',
'/()*+v/', '/()*+\$/', '//');
$replacement = array('$1"', "\n", "\r", "\t", "\v",
'$', '\\');
}
return preg_replace($pattern, $replacement, $string);
diff --git a/tests/phpunit/includes/InterpreterTest.php
b/tests/phpunit/includes/InterpreterTest.php
index ed05291..e4226ce 100644
--- a/tests/phpunit/includes/InterpreterTest.php
+++ b/tests/phpunit/includes/InterpreterTest.php
@@ -145,4 +145,18 @@
"10 + 5 * 5 = 35\n\n"
);
}
+
+ public function testRun_echo_math_variables() {
+ $this->assertEquals(
+ Interpreter::run('
+$foo = 100;
+$bar = \'5\';
+echo "\$foo * \$bar = $foo * $bar = ", $foo * $bar, "\n\n";'),
+ "\$foo * \$bar = 100 * 5 = 500\n\n"
+ );
+ $this->assertEquals(
+ Interpreter::run('echo "\$foo / \$bar = $foo /
$bar = ", $foo / $bar, "\n\n";'),
+ "\$foo / \$bar = 100 / 5 = 20\n\n"
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I162e218cf308b7b97f0affc8ba0fc6d785010e9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for math with variables - change (mediawiki...Foxway)
Pastakhov has submitted this change and it was merged.
Change subject: fix for math with variables
..
fix for math with variables
fix for failed test function testRun_echo_math_variables()
echo "\$foo * \$bar = $foo * $bar = ", $foo * $bar, "\n\n";
Change-Id: I162e218cf308b7b97f0affc8ba0fc6d785010e9d
---
M includes/Interpreter.php
M tests/phpunit/includes/InterpreterTest.php
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 58ad48e..0f2d4ba 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -192,7 +192,6 @@
$debug[] = '' .
htmlspecialchars($text) . '';
}
$runtime->addParam(
self::process_slashes($text, false) );
- $runtime->addOperator('.');
break;
case T_VARIABLE:
if( $expected && in_array(T_VARIABLE,
$expected) ) {
@@ -256,8 +255,8 @@
$pattern = array('/()*+\'/', '//');
$replacement = array('$1\'', '\\');
} else {
- //
(\\)*+\"\n \r
\t \v \$ \\
- $pattern = array('/()*+"/', '/n/',
'/r/', '/t/', '/v/', '/$/', '//');
+ //
(\\)*+\"(\\)*+\n
(\\)*+\r(\\)*+\t
(\\)*+\v(\\)*+\$\\
+ $pattern = array('/()*+"/',
'/()*+n/', '/()*+r/', '/()*+t/',
'/()*+v/', '/()*+\$/', '//');
$replacement = array('$1"', "\n", "\r", "\t", "\v",
'$', '\\');
}
return preg_replace($pattern, $replacement, $string);
diff --git a/tests/phpunit/includes/InterpreterTest.php
b/tests/phpunit/includes/InterpreterTest.php
index ed05291..e4226ce 100644
--- a/tests/phpunit/includes/InterpreterTest.php
+++ b/tests/phpunit/includes/InterpreterTest.php
@@ -145,4 +145,18 @@
"10 + 5 * 5 = 35\n\n"
);
}
+
+ public function testRun_echo_math_variables() {
+ $this->assertEquals(
+ Interpreter::run('
+$foo = 100;
+$bar = \'5\';
+echo "\$foo * \$bar = $foo * $bar = ", $foo * $bar, "\n\n";'),
+ "\$foo * \$bar = 100 * 5 = 500\n\n"
+ );
+ $this->assertEquals(
+ Interpreter::run('echo "\$foo / \$bar = $foo /
$bar = ", $foo / $bar, "\n\n";'),
+ "\$foo / \$bar = 100 / 5 = 20\n\n"
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I162e218cf308b7b97f0affc8ba0fc6d785010e9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
Gerrit-Reviewer: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split time and date in running sentence - change (mediawiki...CreditsSource)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56905
Change subject: Split time and date in running sentence
..
Split time and date in running sentence
Spotted by Purodha and reported in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Creditssource-source-work/ksh_%282%29
Change-Id: Ibeac0aa8adb0e0c3490228242832a93ac1787f51
---
M CreditsSource.i18n.php
M CreditsSource_body.php
2 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreditsSource
refs/changes/05/56905/1
diff --git a/CreditsSource.i18n.php b/CreditsSource.i18n.php
index 9ae886d..56c17ea 100644
--- a/CreditsSource.i18n.php
+++ b/CreditsSource.i18n.php
@@ -10,7 +10,7 @@
$messages['en'] = array(
'creditssource-desc'=> 'Display source work credits in the
page footer',
- 'creditssource-source-work' => 'This page is derived from the page
$1 on $2 in its revision from $3 (UTC). There, it is published under the CC
BY-SA 3.0 license. More details and the full list of contributors can be found
on the associated $5. Wikitravel contributors are marked by the prefix $4.',
+ 'creditssource-source-work' => 'This page is derived from the page
$1 on $2 in its revision from $6 at $7 (UTC). There, it is published under the
CC BY-SA 3.0 license. More details and the full list of contributors can be
found on the associated $5. Wikitravel contributors are marked by the prefix
$4.',
'creditssource-historypage' => 'history page',
'creditssource-creditpage' => 'Gives credits for sourceworks.',
);
@@ -22,11 +22,13 @@
$messages['qqq'] = array(
'creditssource-desc' => '{{desc|name=Credits
Source|url=http://www.mediawiki.org/wiki/Extension:CreditsSource}}',
'creditssource-source-work' => 'Parameters:
-* $1 - external link to the source. its link text is page title.
-* $2 - external link to the site. its link text is site name.
-* $3 - time and date (localized)
-* $4 - short name of the site Wikitravel
-* $5 - link to History page. its text is
{{msg-mw|Creditssource-historypage}}.',
+* $1 is an external link to the source. its link text is page title.
+* $2 is an external link to the site. its link text is site name.
+* $3 is unused.
+* $4 is a short name of the site Wikitravel.
+* $5 is a link to the history page. Its text is
{{msg-mw|Creditssource-historypage}}.
+* $6 is a date.
+* $7 is a time.',
'creditssource-historypage' => 'Used as link anchor text.
The link points to History page of the specified page.',
diff --git a/CreditsSource_body.php b/CreditsSource_body.php
index e26b9a2..89878db 100644
--- a/CreditsSource_body.php
+++ b/CreditsSource_body.php
@@ -62,7 +62,9 @@
$siteLink,
$wgLang->timeanddate( $source->mTs ),
$source->mSiteShortName,
- $historyLink
+ $historyLink,
+ $wgLang->date( $source->mTs ),
+ $wgLang->time( $source->mTs )
)->text();
}
--
To view, visit https://gerrit.wikimedia.org/r/56905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibeac0aa8adb0e0c3490228242832a93ac1787f51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CreditsSource
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for math with union operator - change (mediawiki...Foxway)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56906
Change subject: fix for math with union operator
..
fix for math with union operator
fix for test function testRun_echo_math_union()
echo 10 + 5 . 5 * 9 . 4 - 5 . 8;
Change-Id: I982a546cb8ebcdaf7e9ace216575f35366df5aff
---
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
2 files changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway
refs/changes/06/56906/1
diff --git a/includes/Runtime.php b/includes/Runtime.php
index b13ab6c..28061ec 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -48,17 +48,16 @@
}
public function addParam( $param ) {
+ \MWDebug::log( "function addParam( $param )" );
if( $this->lastOperator ) {
switch ( $this->lastOperator ) {
- case '.':
- $this->lastParam .= $param;
- break;
case '*':
$this->lastParam *= $param;
break;
case '/':
$this->lastParam /= $param;
break;
+ case '.':
case '+':
case '-':
$this->mathMemory =
array($this->lastParam, $this->lastOperator);
@@ -89,7 +88,8 @@
}
public function addOperator( $operator ) {
- if( $this->mathMemory && ($operator=='+'||$operator=='-') ){
+ \MWDebug::log( "function addOperator( $operator )" );
+ if( $this->mathMemory &&
($operator=='+'||$operator=='-'||$operator=='.') ){
if( $this->mathMemory[1] == '+' ) {
$this->lastParam = $this->mathMemory[0] +
$this->lastParam;
} elseif ( $this->mathMemory[1] == '-' ) {
@@ -100,6 +100,7 @@
$this->mathMemory = false;
}
$this->lastOperator = $operator;
+ \MWDebug::log( $this->lastParam );
}
public function getCommandResult( &$debug ) {
diff --git a/tests/phpunit/includes/InterpreterTest.php
b/tests/phpunit/includes/InterpreterTest.php
index e4226ce..74951d1 100644
--- a/tests/phpunit/includes/InterpreterTest.php
+++ b/tests/phpunit/includes/InterpreterTest.php
@@ -130,6 +130,10 @@
'55'
);
$this->assertEquals(
+ Interpreter::run('echo 5 + 5 + 10 + 20 - 50 -
5;'),
+ '-15'
+ );
+ $this->assertEquals(
Interpreter::run('echo 5 + 5 / 10 + 50/100;'),
'6'
);
@@ -159,4 +163,19 @@
"\$foo / \$bar = 100 / 5 = 20\n\n"
);
}
+
+ public function testRun_echo_math_union() {
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5;'),
+ '155'
+ );
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5 * 9;'),
+ '1545'
+ );
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5 * 9 . 4 - 5
. 8;'),
+ '154498'
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I982a546cb8ebcdaf7e9ace216575f35366df5aff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for math with union operator - change (mediawiki...Foxway)
Pastakhov has submitted this change and it was merged.
Change subject: fix for math with union operator
..
fix for math with union operator
fix for test function testRun_echo_math_union()
echo 10 + 5 . 5 * 9 . 4 - 5 . 8;
Change-Id: I982a546cb8ebcdaf7e9ace216575f35366df5aff
---
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
2 files changed, 21 insertions(+), 4 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/includes/Runtime.php b/includes/Runtime.php
index b13ab6c..e9697a5 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -50,15 +50,13 @@
public function addParam( $param ) {
if( $this->lastOperator ) {
switch ( $this->lastOperator ) {
- case '.':
- $this->lastParam .= $param;
- break;
case '*':
$this->lastParam *= $param;
break;
case '/':
$this->lastParam /= $param;
break;
+ case '.':
case '+':
case '-':
$this->mathMemory =
array($this->lastParam, $this->lastOperator);
@@ -89,7 +87,7 @@
}
public function addOperator( $operator ) {
- if( $this->mathMemory && ($operator=='+'||$operator=='-') ){
+ if( $this->mathMemory &&
($operator=='+'||$operator=='-'||$operator=='.') ){
if( $this->mathMemory[1] == '+' ) {
$this->lastParam = $this->mathMemory[0] +
$this->lastParam;
} elseif ( $this->mathMemory[1] == '-' ) {
diff --git a/tests/phpunit/includes/InterpreterTest.php
b/tests/phpunit/includes/InterpreterTest.php
index e4226ce..74951d1 100644
--- a/tests/phpunit/includes/InterpreterTest.php
+++ b/tests/phpunit/includes/InterpreterTest.php
@@ -130,6 +130,10 @@
'55'
);
$this->assertEquals(
+ Interpreter::run('echo 5 + 5 + 10 + 20 - 50 -
5;'),
+ '-15'
+ );
+ $this->assertEquals(
Interpreter::run('echo 5 + 5 / 10 + 50/100;'),
'6'
);
@@ -159,4 +163,19 @@
"\$foo / \$bar = 100 / 5 = 20\n\n"
);
}
+
+ public function testRun_echo_math_union() {
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5;'),
+ '155'
+ );
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5 * 9;'),
+ '1545'
+ );
+ $this->assertEquals(
+ Interpreter::run('echo 10 + 5 . 5 * 9 . 4 - 5
. 8;'),
+ '154498'
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I982a546cb8ebcdaf7e9ace216575f35366df5aff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
Gerrit-Reviewer: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split time and date in running sentence - change (mediawiki...CreditsSource)
Matthias Mullie has submitted this change and it was merged.
Change subject: Split time and date in running sentence
..
Split time and date in running sentence
Spotted by Purodha and reported in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Creditssource-source-work/ksh_%282%29
Change-Id: Ibeac0aa8adb0e0c3490228242832a93ac1787f51
---
M CreditsSource.i18n.php
M CreditsSource_body.php
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Matthias Mullie: Verified; Looks good to me, approved
diff --git a/CreditsSource.i18n.php b/CreditsSource.i18n.php
index 9ae886d..56c17ea 100644
--- a/CreditsSource.i18n.php
+++ b/CreditsSource.i18n.php
@@ -10,7 +10,7 @@
$messages['en'] = array(
'creditssource-desc'=> 'Display source work credits in the
page footer',
- 'creditssource-source-work' => 'This page is derived from the page
$1 on $2 in its revision from $3 (UTC). There, it is published under the CC
BY-SA 3.0 license. More details and the full list of contributors can be found
on the associated $5. Wikitravel contributors are marked by the prefix $4.',
+ 'creditssource-source-work' => 'This page is derived from the page
$1 on $2 in its revision from $6 at $7 (UTC). There, it is published under the
CC BY-SA 3.0 license. More details and the full list of contributors can be
found on the associated $5. Wikitravel contributors are marked by the prefix
$4.',
'creditssource-historypage' => 'history page',
'creditssource-creditpage' => 'Gives credits for sourceworks.',
);
@@ -22,11 +22,13 @@
$messages['qqq'] = array(
'creditssource-desc' => '{{desc|name=Credits
Source|url=http://www.mediawiki.org/wiki/Extension:CreditsSource}}',
'creditssource-source-work' => 'Parameters:
-* $1 - external link to the source. its link text is page title.
-* $2 - external link to the site. its link text is site name.
-* $3 - time and date (localized)
-* $4 - short name of the site Wikitravel
-* $5 - link to History page. its text is
{{msg-mw|Creditssource-historypage}}.',
+* $1 is an external link to the source. its link text is page title.
+* $2 is an external link to the site. its link text is site name.
+* $3 is unused.
+* $4 is a short name of the site Wikitravel.
+* $5 is a link to the history page. Its text is
{{msg-mw|Creditssource-historypage}}.
+* $6 is a date.
+* $7 is a time.',
'creditssource-historypage' => 'Used as link anchor text.
The link points to History page of the specified page.',
diff --git a/CreditsSource_body.php b/CreditsSource_body.php
index e26b9a2..89878db 100644
--- a/CreditsSource_body.php
+++ b/CreditsSource_body.php
@@ -62,7 +62,9 @@
$siteLink,
$wgLang->timeanddate( $source->mTs ),
$source->mSiteShortName,
- $historyLink
+ $historyLink,
+ $wgLang->date( $source->mTs ),
+ $wgLang->time( $source->mTs )
)->text();
}
--
To view, visit https://gerrit.wikimedia.org/r/56905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeac0aa8adb0e0c3490228242832a93ac1787f51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CreditsSource
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Matthias Mullie
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable translation for ArticleFeedback - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/56907 Change subject: Disable translation for ArticleFeedback .. Disable translation for ArticleFeedback No longer maintained by or deployed at Wikimedia. No other known maintainers. Change-Id: Ib0811cdcb250e7b8c85ad0fdb7c043db4586bcd1 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/07/56907/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 8123843..459f0fc 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -49,11 +49,12 @@ Arrays -Article Feedback -aliasfile = ArticleFeedback/ArticleFeedback.alias.php -optional = articlefeedback-form-panel-helpimprove-email-placeholder -optional = articlefeedback-table-noratings -ignored = articlefeedback-pitch-edit-body +# Unmaintained by Wikimedia, no longer deployed. +#Article Feedback +#aliasfile = ArticleFeedback/ArticleFeedback.alias.php +#optional = articlefeedback-form-panel-helpimprove-email-placeholder +#optional = articlefeedback-table-noratings +#ignored = articlefeedback-pitch-edit-body Article Feedback v5 aliasfile = ArticleFeedbackv5/ArticleFeedbackv5.alias.php -- To view, visit https://gerrit.wikimedia.org/r/56907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0811cdcb250e7b8c85ad0fdb7c043db4586bcd1 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not show the first proofread tooltip when proofread disab... - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56909
Change subject: Do not show the first proofread tooltip when proofread disabled.
..
Do not show the first proofread tooltip when proofread disabled.
Change-Id: I7f036feefc7b34db5916e19abfb54b0072c7d687
---
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.proofread.js
2 files changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/09/56909/1
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index fffa0bc..ed1b6f9 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -136,8 +136,10 @@
$message = this.addProofread( message );
if ( !this.firstProofreadTipShown ) {
- $message.find( '.tux-proofread-action'
).tipsy( 'show' );
- this.firstProofreadTipShown = true;
+ if ( $message.find(
'.tux-proofread-action' ).length ) {
+ $message.find(
'.tux-proofread-action' ).tipsy( 'show' );
+ this.firstProofreadTipShown =
true;
+ }
}
return;
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index 7554878..e25ebc3 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -117,16 +117,16 @@
this.render();
// No review before translating.
if ( !this.message.translation ) {
- this.hide();
+ this.disableProofread();
}
// No review for fuzzy messages.
if ( this.message.properties.status === 'fuzzy' ) {
- this.hide();
+ this.disableProofread();
}
if ( !mw.translate.canProofread() ) {
- this.hide();
+ this.disableProofread();
}
proofread.$message.translateeditor( {
@@ -137,7 +137,7 @@
proofread.message.translation =
translation;
proofread.$message.addClass(
'own-translation' );
// Own translations cannot be reviewed,
so hide the review button
- proofread.hide();
+ proofread.disableProofread();
}
} );
@@ -224,8 +224,8 @@
if ( translatedBySelf ) {
this.$message.addClass( 'own-translation' );
- // Own translations cannot be reviewed, so hide
the review button
- this.hide();
+ // Own translations cannot be reviewed, so
disable proofread
+ this.disableProofread();
}
/* Here we need to check that there are reviewers in
the first place
@@ -235,9 +235,9 @@
}
},
- hide: function () {
+ disableProofread: function () {
this.$message.find( '.tux-proofread-action' )
- .addClass( 'hide' );
+ .remove();
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/56909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f036feefc7b34db5916e19abfb54b0072c7d687
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 46687) When user modifies a translation, it should no l... - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: (Bug 46687) When user modifies a translation, it should no longer be proofreadable .. (Bug 46687) When user modifies a translation, it should no longer be proofreadable Change-Id: I9218ee8a7dd308babe2f6a78eee1c4846c130367 --- M resources/js/ext.translate.proofread.js 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Amire80: 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 4768e51..7554878 100644 --- a/resources/js/ext.translate.proofread.js +++ b/resources/js/ext.translate.proofread.js @@ -135,6 +135,9 @@ proofread.$message.find( '.tux-proofread-translation' ) .text( translation ); proofread.message.translation = translation; + proofread.$message.addClass( 'own-translation' ); + // Own translations cannot be reviewed, so hide the review button + proofread.hide(); } } ); -- To view, visit https://gerrit.wikimedia.org/r/56588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9218ee8a7dd308babe2f6a78eee1c4846c130367 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Santhosh Gerrit-Reviewer: Amire80 Gerrit-Reviewer: Santhosh Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove duplicate word - change (mediawiki...OpenID)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/56910 Change subject: Remove duplicate word .. Remove duplicate word Change-Id: I02bcb68233d1f4abd84971d4e66aefe8c8fdebc9 --- M OpenID.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID refs/changes/10/56910/1 diff --git a/OpenID.i18n.php b/OpenID.i18n.php index 0cec1a4..c94ac69 100644 --- a/OpenID.i18n.php +++ b/OpenID.i18n.php @@ -37,7 +37,7 @@ 'openidlogin' => 'Log in / create account with OpenID', 'openidserver' => 'OpenID server', 'openid-identifier-page-text-user' => 'This page is the identifier for user "$1".', - 'openid-identifier-page-text-different-user' => 'This page is the identifier for user User ID $1.', + 'openid-identifier-page-text-different-user' => 'This page is the identifier for user ID $1.', 'openid-identifier-page-text-no-such-local-openid' => 'This is an invalid local OpenID identifier.', 'openid-server-identity-page-text' => 'This is a technical OpenID server page for starting the OpenID authentication. The page has no other purpose.', 'openidxrds' => 'Yadis file', -- To view, visit https://gerrit.wikimedia.org/r/56910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02bcb68233d1f4abd84971d4e66aefe8c8fdebc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenID Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swift: add a document root container - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56911
Change subject: Swift: add a document root container
..
Swift: add a document root container
Certain files need to reside in the root container, namely robots.txt,
crossdomain.xml and, less importantly, favicon.ico & index.html.
Add a "root" container and a rewrite.py rule that rewrites ^/[^/]*$ to
it.
Change-Id: I38b641e0f047f4d9efad88713acde6027a3e4e17
---
M files/swift/SwiftMedia/wmf/rewrite.py
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/56911/1
diff --git a/files/swift/SwiftMedia/wmf/rewrite.py
b/files/swift/SwiftMedia/wmf/rewrite.py
index 3946000..db14f75 100644
--- a/files/swift/SwiftMedia/wmf/rewrite.py
+++ b/files/swift/SwiftMedia/wmf/rewrite.py
@@ -280,6 +280,25 @@
resp = webob.exc.HTTPNotFound('Monitoring type not found
"%s"' % (req.path))
return resp(env, start_response)
+if match is None:
+match = re.match(r'^/(?P[^/]+)?$', req.path)
+# /index.html /favicon.ico /robots.txt etc.
+# serve from a default "root" container
+if match:
+path = match.group('path')
+if not path:
+path = 'index.html'
+
+req.host = '127.0.0.1:%s' % self.bind_port
+req.path_info = "/v1/%s/root/%s" % (self.account, path)
+
+app_iter = self._app_call(env)
+status = self._get_status_int()
+headers = self._response_headers
+
+resp = webob.Response(status=status, headers=headers,
app_iter=app_iter)
+return resp(env, start_response)
+
# Internally rewrite the URL based on the regex it matched...
if match:
# Get the per-project "conceptual" container name, e.g.
""
--
To view, visit https://gerrit.wikimedia.org/r/56911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38b641e0f047f4d9efad88713acde6027a3e4e17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swift: add a document root container - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: Swift: add a document root container
..
Swift: add a document root container
Certain files need to reside in the root container, namely robots.txt,
crossdomain.xml and, less importantly, favicon.ico & index.html.
Add a "root" container and a rewrite.py rule that rewrites ^/[^/]*$ to
it.
Change-Id: I38b641e0f047f4d9efad88713acde6027a3e4e17
---
M files/swift/SwiftMedia/wmf/rewrite.py
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/swift/SwiftMedia/wmf/rewrite.py
b/files/swift/SwiftMedia/wmf/rewrite.py
index 3946000..db14f75 100644
--- a/files/swift/SwiftMedia/wmf/rewrite.py
+++ b/files/swift/SwiftMedia/wmf/rewrite.py
@@ -280,6 +280,25 @@
resp = webob.exc.HTTPNotFound('Monitoring type not found
"%s"' % (req.path))
return resp(env, start_response)
+if match is None:
+match = re.match(r'^/(?P[^/]+)?$', req.path)
+# /index.html /favicon.ico /robots.txt etc.
+# serve from a default "root" container
+if match:
+path = match.group('path')
+if not path:
+path = 'index.html'
+
+req.host = '127.0.0.1:%s' % self.bind_port
+req.path_info = "/v1/%s/root/%s" % (self.account, path)
+
+app_iter = self._app_call(env)
+status = self._get_status_int()
+headers = self._response_headers
+
+resp = webob.Response(status=status, headers=headers,
app_iter=app_iter)
+return resp(env, start_response)
+
# Internally rewrite the URL based on the regex it matched...
if match:
# Get the per-project "conceptual" container name, e.g.
""
--
To view, visit https://gerrit.wikimedia.org/r/56911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38b641e0f047f4d9efad88713acde6027a3e4e17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swift: add rewrites for legacy math URLs - change (operations/puppet)
Faidon has uploaded a new change for review. https://gerrit.wikimedia.org/r/56912 Change subject: Swift: add rewrites for legacy math URLs .. Swift: add rewrites for legacy math URLs Project/lang math URLs were deprecated quite a while ago but we're still getting a considerable amount of hits to them (which right now are not routed to Swift at all). Expand the regexp to cover those too, but map them still to the global containers. Change-Id: I3c454490b9f9dbc8baf8158566f1c65fa848e6f5 --- M files/swift/SwiftMedia/wmf/rewrite.py 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/56912/1 diff --git a/files/swift/SwiftMedia/wmf/rewrite.py b/files/swift/SwiftMedia/wmf/rewrite.py index db14f75..ef30cd8 100644 --- a/files/swift/SwiftMedia/wmf/rewrite.py +++ b/files/swift/SwiftMedia/wmf/rewrite.py @@ -190,8 +190,10 @@ # (d) global-data-repo-zone.shard (if sharded) # # Rewrite wiki-global URLs of these forms: -# (a) http://upload.wikimedia.org/math/.* -# => http://msfe/v1/AUTH_/global-data-math-render/.* +# (a) http://upload.wikimedia.org/math/ +# => http://msfe/v1/AUTH_/global-data-math-render/ +# (b) http://upload.wikimedia.org///math/ (legacy) +# => http://msfe/v1/AUTH_/global-data-math-render/ # # Rewrite wiki-relative URLs of these forms: # (a) http://upload.wikimedia.org/// @@ -238,7 +240,9 @@ # math renderings if match is None: # /math/c/9/f/c9f2055dadfb49853eff822a453d9ceb.png -match = re.match(r'^/(?Pmath)/(?P(?P[0-9a-f])/(?P[0-9a-f])/.+)$', req.path) +# /wikipedia/en/math/c/9/f/c9f2055dadfb49853eff822a453d9ceb.png (legacy) +match = re.match(r'^(/(?P[^/]+)/(?P[^/]+))?/(?Pmath)/(?P(?P[0-9a-f])/(?P[0-9a-f])/.+)$', req.path) + if match: proj = 'global' lang = 'data' -- To view, visit https://gerrit.wikimedia.org/r/56912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c454490b9f9dbc8baf8158566f1c65fa848e6f5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rm SVN working copies - change (mediawiki...RDFIO)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56913
Change subject: rm SVN working copies
..
rm SVN working copies
Change-Id: Id2af14aba6adb8a89ff22753d9e731ac95fc5a72
---
D bundle/.svn/entries
D bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
D bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
D stores/.svn/entries
D stores/.svn/prop-base/SMW_ARC2Store.php.svn-base
D stores/.svn/text-base/SMW_ARC2Store.php.svn-base
6 files changed, 0 insertions(+), 570 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RDFIO
refs/changes/13/56913/1
diff --git a/bundle/.svn/entries b/bundle/.svn/entries
deleted file mode 100644
index 84d20ee..000
--- a/bundle/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-98042
-svn+ssh://samuella...@svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/RDFIO/bundle
-svn+ssh://samuella...@svn.wikimedia.org/svnroot/mediawiki
-
-
-
-2011-06-17T16:27:45.408791Z
-90288
-reedy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-dd0e9695-b195-4be7-bd10-2dea1a65a6b6
-
-ARC2_SPARQLSerializerPlugin.php
-file
-
-
-
-
-2011-07-28T23:04:45.00Z
-7b2c37e8e2a782ce523816cd93edf37a
-2011-06-17T16:27:45.408791Z
-90288
-reedy
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5739
-
diff --git a/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
b/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
deleted file mode 100644
index bdbd305..000
--- a/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
b/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
deleted file mode 100644
index 3f3e9a5..000
--- a/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
+++ /dev/null
@@ -1,200 +0,0 @@
-http://arc.semsol.org/license
-
-class:ARC2 SPARQL Serialiser Plugin
-author: Keith Alexander
-version: 2008-06-22
-
-fixed some bugs with literal typing and escaping
-
-*/
-
-ARC2::inc( 'Class' );
-
-class ARC2_SPARQLSerializerPlugin extends ARC2_Class {
-
- function __construct( $a = '', &$caller ) {
-parent::__construct( $a, $caller );
- }
-
- function ARC2_SPARQLSerializerPlugin ( $a = '', &$caller ) {
-$this->__construct( $a, $caller );
- }
-
- function __init() {
-parent::__init();
- }
-
- function toString( $infos ) {
- $this->infos = $infos;
- return self::sparql_info_to_string( $infos['query'] );
- }
-
- function sparql_info_to_string( $t, $only_triples = false ) {
- $string = '';
- if ( isset( $t['type'] ) ) {
- switch( $t['type'] ) {
- case 'construct':
- $string .= 'CONSTRUCT { ' .
$this->sparql_info_to_string( $t['construct_triples'], true ) . ' } ';
- case 'describe':
- case 'select':
- if ( in_array( $t['type'], array(
'select', 'describe' ) ) ) {
-$string .= ' ' .
strtoupper( $t['type'] ) . ' ';
- if ( isset(
$t['result_vars'] ) ) foreach ( $t['result_vars'] as $v ) {
- $string .= ' ?'
. $v['var'];
- }
- if ( isset(
$t['result_iris'] ) ) foreach ( $t['result_iris'] as $v ) {
- $string .= ' <'
. $v['iri'] . '> ';
- }
- }
- case 'ask':
- if ( !empty( $t['dataset'] ) ) {
- foreach ( $t['dataset'] as
$dataset ) {
- $string .= ' FROM ' . (
( $dataset['named'] ) ? 'NAMED ': '' ) . '<' . $dataset['graph'] . '> ';
- }
- }
- if ( !isset( $t['pattern'] ) )
var_dump( $this->infos );
- else $string .= ' WHERE ' .
$this->sparql_info_to_string( $t['pattern'] ) . '';
- break;
- case 'triple':
- $string .= $this->triple_to_string( $t
);
- break;
- case 'union':
- $patterns = array();
-
[MediaWiki-commits] [Gerrit] rm SVN working copies - change (mediawiki...RDFIO)
MaxSem has submitted this change and it was merged.
Change subject: rm SVN working copies
..
rm SVN working copies
Change-Id: Id2af14aba6adb8a89ff22753d9e731ac95fc5a72
---
D bundle/.svn/entries
D bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
D bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
D stores/.svn/entries
D stores/.svn/prop-base/SMW_ARC2Store.php.svn-base
D stores/.svn/text-base/SMW_ARC2Store.php.svn-base
6 files changed, 0 insertions(+), 570 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
diff --git a/bundle/.svn/entries b/bundle/.svn/entries
deleted file mode 100644
index 84d20ee..000
--- a/bundle/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-98042
-svn+ssh://samuella...@svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/RDFIO/bundle
-svn+ssh://samuella...@svn.wikimedia.org/svnroot/mediawiki
-
-
-
-2011-06-17T16:27:45.408791Z
-90288
-reedy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-dd0e9695-b195-4be7-bd10-2dea1a65a6b6
-
-ARC2_SPARQLSerializerPlugin.php
-file
-
-
-
-
-2011-07-28T23:04:45.00Z
-7b2c37e8e2a782ce523816cd93edf37a
-2011-06-17T16:27:45.408791Z
-90288
-reedy
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5739
-
diff --git a/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
b/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
deleted file mode 100644
index bdbd305..000
--- a/bundle/.svn/prop-base/ARC2_SPARQLSerializerPlugin.php.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:eol-style
-V 6
-native
-END
diff --git a/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
b/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
deleted file mode 100644
index 3f3e9a5..000
--- a/bundle/.svn/text-base/ARC2_SPARQLSerializerPlugin.php.svn-base
+++ /dev/null
@@ -1,200 +0,0 @@
-http://arc.semsol.org/license
-
-class:ARC2 SPARQL Serialiser Plugin
-author: Keith Alexander
-version: 2008-06-22
-
-fixed some bugs with literal typing and escaping
-
-*/
-
-ARC2::inc( 'Class' );
-
-class ARC2_SPARQLSerializerPlugin extends ARC2_Class {
-
- function __construct( $a = '', &$caller ) {
-parent::__construct( $a, $caller );
- }
-
- function ARC2_SPARQLSerializerPlugin ( $a = '', &$caller ) {
-$this->__construct( $a, $caller );
- }
-
- function __init() {
-parent::__init();
- }
-
- function toString( $infos ) {
- $this->infos = $infos;
- return self::sparql_info_to_string( $infos['query'] );
- }
-
- function sparql_info_to_string( $t, $only_triples = false ) {
- $string = '';
- if ( isset( $t['type'] ) ) {
- switch( $t['type'] ) {
- case 'construct':
- $string .= 'CONSTRUCT { ' .
$this->sparql_info_to_string( $t['construct_triples'], true ) . ' } ';
- case 'describe':
- case 'select':
- if ( in_array( $t['type'], array(
'select', 'describe' ) ) ) {
-$string .= ' ' .
strtoupper( $t['type'] ) . ' ';
- if ( isset(
$t['result_vars'] ) ) foreach ( $t['result_vars'] as $v ) {
- $string .= ' ?'
. $v['var'];
- }
- if ( isset(
$t['result_iris'] ) ) foreach ( $t['result_iris'] as $v ) {
- $string .= ' <'
. $v['iri'] . '> ';
- }
- }
- case 'ask':
- if ( !empty( $t['dataset'] ) ) {
- foreach ( $t['dataset'] as
$dataset ) {
- $string .= ' FROM ' . (
( $dataset['named'] ) ? 'NAMED ': '' ) . '<' . $dataset['graph'] . '> ';
- }
- }
- if ( !isset( $t['pattern'] ) )
var_dump( $this->infos );
- else $string .= ' WHERE ' .
$this->sparql_info_to_string( $t['pattern'] ) . '';
- break;
- case 'triple':
- $string .= $this->triple_to_string( $t
);
- break;
- case 'union':
- $patterns = array();
- foreach ( $t['patterns'] as $pattern ) {
-
[MediaWiki-commits] [Gerrit] Move getIcon method to TranslateUtils - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Move getIcon method to TranslateUtils
..
Move getIcon method to TranslateUtils
It need to be reused in multiple places now
Change-Id: I24fb73e31ab9433bb6046014e5e6937910a8f8e4
---
M TranslateUtils.php
M api/ApiQueryMessageGroups.php
2 files changed, 33 insertions(+), 30 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateUtils.php b/TranslateUtils.php
index f655dc3..edef392 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -393,4 +393,36 @@
static $i = 0;
return "\x7fUNIQ" . dechex( mt_rand( 0, 0x7fff ) ) .
dechex( mt_rand( 0, 0x7fff ) ) . '-' . $i++;
}
+
+ /**
+* For the give message group get the icons in vector and raster formats
+* @return array
+*/
+ public static function getIcon( MessageGroup $g, $size ) {
+ global $wgServer;
+ $icon = $g->getIcon();
+ if ( substr( $icon, 0, 7 ) !== 'wiki://' ) {
+ return null;
+ }
+
+ $formats = array();
+
+ $filename = substr( $icon, 7 );
+ $file = wfFindFile( $filename );
+ if ( !$file ) {
+ return null;
+ }
+
+ if ( $file->isVectorized() ) {
+ $formats['vector'] = $file->getUrl();
+ }
+
+ $formats['raster'] = $wgServer . $file->createThumb( $size,
$size );
+
+ foreach ( $formats as $key => &$url ) {
+ $url = wfExpandUrl( $url, PROTO_RELATIVE );
+ }
+
+ return $formats;
+ }
}
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index a69d58c..c9abe10 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -129,7 +129,7 @@
}
if ( isset( $props['icon'] ) ) {
- $formats = $this->getIcon( $g, $params['iconsize'] );
+ $formats = TranslateUtils::getIcon( $g,
$params['iconsize'] );
if ( $formats ) {
$a['icon'] = $formats;
}
@@ -172,35 +172,6 @@
}
return $a;
- }
-
- protected function getIcon( MessageGroup $g, $size ) {
- global $wgServer;
- $icon = $g->getIcon();
- if ( substr( $icon, 0, 7 ) !== 'wiki://' ) {
- return null;
- }
-
- $formats = array();
-
- $filename = substr( $icon, 7 );
- $file = wfFindFile( $filename );
- if ( !$file ) {
- $this->setWarning( "Unknown file $icon" );
- return null;
- }
-
- if ( $file->isVectorized() ) {
- $formats['vector'] = $file->getUrl();
- }
-
- $formats['raster'] = $wgServer . $file->createThumb( $size,
$size );
-
- foreach ( $formats as $key => &$url ) {
- $url = wfExpandUrl( $url, PROTO_RELATIVE );
- }
-
- return $formats;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/56375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24fb73e31ab9433bb6046014e5e6937910a8f8e4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not show the first proofread tooltip when proofread disab... - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not show the first proofread tooltip when proofread disabled.
..
Do not show the first proofread tooltip when proofread disabled.
Change-Id: I7f036feefc7b34db5916e19abfb54b0072c7d687
---
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.proofread.js
2 files changed, 12 insertions(+), 10 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 fffa0bc..ed1b6f9 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -136,8 +136,10 @@
$message = this.addProofread( message );
if ( !this.firstProofreadTipShown ) {
- $message.find( '.tux-proofread-action'
).tipsy( 'show' );
- this.firstProofreadTipShown = true;
+ if ( $message.find(
'.tux-proofread-action' ).length ) {
+ $message.find(
'.tux-proofread-action' ).tipsy( 'show' );
+ this.firstProofreadTipShown =
true;
+ }
}
return;
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index 7554878..e25ebc3 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -117,16 +117,16 @@
this.render();
// No review before translating.
if ( !this.message.translation ) {
- this.hide();
+ this.disableProofread();
}
// No review for fuzzy messages.
if ( this.message.properties.status === 'fuzzy' ) {
- this.hide();
+ this.disableProofread();
}
if ( !mw.translate.canProofread() ) {
- this.hide();
+ this.disableProofread();
}
proofread.$message.translateeditor( {
@@ -137,7 +137,7 @@
proofread.message.translation =
translation;
proofread.$message.addClass(
'own-translation' );
// Own translations cannot be reviewed,
so hide the review button
- proofread.hide();
+ proofread.disableProofread();
}
} );
@@ -224,8 +224,8 @@
if ( translatedBySelf ) {
this.$message.addClass( 'own-translation' );
- // Own translations cannot be reviewed, so hide
the review button
- this.hide();
+ // Own translations cannot be reviewed, so
disable proofread
+ this.disableProofread();
}
/* Here we need to check that there are reviewers in
the first place
@@ -235,9 +235,9 @@
}
},
- hide: function () {
+ disableProofread: function () {
this.$message.find( '.tux-proofread-action' )
- .addClass( 'hide' );
+ .remove();
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/56909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f036feefc7b34db5916e19abfb54b0072c7d687
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refresh expired edit token - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Refresh expired edit token
..
Refresh expired edit token
Use the postWithEditToken api method to post. It will take
care of expired/invalid tokens.
Bug: 45766
Change-Id: I2bc6724cee387c8f849aa7903d968548ae39c848
---
M Resources.php
M resources/js/ext.translate.editor.js
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index aa3bd2c..75a1172 100644
--- a/Resources.php
+++ b/Resources.php
@@ -45,6 +45,7 @@
'mediawiki.util',
'mediawiki.Uri',
'mediawiki.api',
+ 'mediawiki.api.edit',
'mediawiki.api.parse',
'mediawiki.user',
'mediawiki.jqueryMsg',
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index ed130fe..3749a9c 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -129,12 +129,11 @@
// immediately move to the next message.
translateEditor.next();
- api.post( {
+ api.postWithEditToken( {
action: 'edit',
title: translateEditor.message.title,
- text: translation,
- token: mw.user.tokens.get( 'editToken' )
- } ).done( function ( response ) {
+ text: translation
+ }, function ( response ) {
if ( response.edit.result === 'Success' ) {
translateEditor.markTranslated();
@@ -162,7 +161,7 @@
}
mw.translate.dirty = false;
- } ).fail( function ( errorCode, results ) {
+ }, function ( errorCode, results ) {
translateEditor.savingError( results.error.info
);
translateEditor.saving = false;
--
To view, visit https://gerrit.wikimedia.org/r/56592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc6724cee387c8f849aa7903d968548ae39c848
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed segfault - change (analytics/webstatscollector)
Ottomata has submitted this change and it was merged. Change subject: Fixed segfault .. Fixed segfault Change-Id: I63871716ade4cc657720ad42ef03c6fd7741fceb --- A big-entry-1.txt M filter.c M test.sh 3 files changed, 21 insertions(+), 9 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/big-entry-1.txt b/big-entry-1.txt new file mode 100644 index 000..b92f0f3 --- /dev/null +++ b/big-entry-1.txt @@ -0,0 +1 @@ +amssq46.esams.wikimedia.org 183925014 2013-03-26T18:42:47.309 316 0.0.0.0 TCP_MISS/2002646GET http://es.wikipedia.org/w/api.php?action=query&prop=revisions&rvprop=content&titles=TKRBeneficioDif(%)IngresosDif(%)BPAEBITDAPeriodoPrevisionesNoticiaA3TV3190658074110-80001539504T12VerVerABE10240042304039003201262459004T12VerVerABG12540-5100778300979023--4T12VerVerACS-196200--28472003490-6463088004T12VerVerACX-1832--455500-250-007197604T12VerVerADV1420--115500350011548004T12VerVerALB-29940---508--4T12VerVerALM7640-93090020310045124004T12VerVerAMA5751018002910007501131107704T12VerVerAMP-24571949034800-1100-0759604T12VerVerANA18940-6277016005603151431004T12VerVerAZK1101750011890-350003--4T12VerVerBAY97100-8404T12VerVerBBVA167600-4420031--4T12VerVerBDL183481008070-22039134704T12VerVerBIO-092-77501629400660-0022279004T12VerVerBKIA-1919300287403153003020-990--4T12VerVerBKT12470-3120023--4T12VerVerBME13550-127029620-780170197304T12VerVerBVA-3630586-101--4T12VerVerCABK23000-7820024--4T12VerVerCAF9940-3200172100--2916181904T12VerVerCBAV-540--9000-4000199604T12VerVerCDR-10460--1663902110-190305204T12VerVerCIE6100070156250-660051234104T12VerVerCLEO-129035005300-1850132--4T12VerVerCOL-112900--22500-200-420175004T12VerVerCPF1570--191830498-024150504T12VerVerCPL-14710550065370-1290-38669804T12VerVerCUN1027-9193504-4514T12VerVerDERM1100-59002900-1940-145-11704T12VerVerDIA1579060401167900670024609504T12VerVerDIN2620--11027604T12VerVerEAD1228001900564800015001502186004T12VerVerEBRO158404602041001310107299504T12VerVerECR-121313970066750-120-012677504T12VerVerELE203400-80033933003801927005004T12VerVerENC430040082800030012139004T12VerVerENEL41300120268800640--1678004T12VerVerENG37950410114040400159934304T12VerVerENO8760-2390193100320135263704T12VerVerEZE-1945-510019040-040-00910284T12VerVerFAE195037001761074001021354T12VerVerFCC-102800--1115200-630-707753004T12VerVerFDR1450-39062880080-11572204T12VerVerFER70970-4290768640320051926804T12VerVerFRS-6898-32604460400-05031904T12VerVerFUN100--12030318--4T12VerVerGALQ6100-500014000-3100--14504T12VerVerGAM-65900--284400-620-018--4T12VerVerGAS144100880249040018201465080004T12VerVerGCO20020-490323680050165--4T12VerVerGRF25670410302620904600--836104T12VerVerGSJ-9900--65800-1250-14987004T12VerVerIAG-92300--15372001390---68004T12VerVerIBE2840701303428100477726604T12VerVerIBG1740-23802161010017733004T12VerVerIDR13270-2700294100900080249004T12VerVerINSUR-1807--51411960--12304T12VerVerINY-493-36003476-900-0170934T12VerVerITX2361002200159460015003793913004T12VerVerJAZ62002200908602100025172704T12VerVerLGT026-91965590-2235174T12VerVerMAP66570-31002530120750022--4T12VerVerMCM274018401990041021752814T12VerVerMDF116001630916001440072126304T12VerVerMEL4210030136240200023249504T12VerVerMTBA-2910--880-5260-024--4T12VerVerMTF-58200-03016040-1100-464-7704T12VerVerMTS-274600--6219593-1040--5717964T12VerVerMVC-26930862025780-2610-027121604T12VerVerNAT-440041035500--012--4T12VerVerNEA700--3170-5000-058-4304T12VerVerNHH-29210--131010-340-1185504T12VerVerNTC-602993150--0864T12VerVerOHL100550350304029008809661052904T12VerVerOLE-24500--82880-1370--88304T12VerVerPAC1429-65009802030001690054T12VerVerPOP-246100---023--4T12VerVerPRM9203728866-30405715114T12VerVerPRS-1282--266400-220-061476004T12VerVerPSG172002703669003060028427004T12VerVerQBT-7670-2000361606900-008-11804T12VerVerR454919603700150013--4T12VerVerREE492286901755207203641299104T12VerVerREN36010005250-65000236204T12VerVerREP206000-610595930013201756956004T12VerVerREY-910001427013600-4920-174-709304T12VerVerRIO0741911673390014--4T12VerVerRLIA-31900--21700-2260-007124104T12VerVerROVI19508002019090003927004T12VerVerSAB8190-6470006--4T12VerVerSAN220500-5880024--4T12VerVerSED1337017000117400013-36924804T12VerVerSLR-2400-75001690-8380-0246504T12VerVerSNC-2160--12670-1120-009-4504T12VerVerSPS-1820-543020960-410-0296374T12VerVerSTG35201040-15114404T12VerVerSYV-97700--361370-574-565506004T12VerVerTEC-410--38500-300--4504T12VerVerTEF392800-27306235600-08008821231004T12VerVerTL55014-546088670-121001164904T12VerVerTRE13630090265650150240157004T12VerVerTUB1180224005324094000945784T12VerVerTVX91336304047440-890-07841264T12VerVerURA-4300592062100-800-01856004T12VerVerVER-4060-16609120-3560-0135704T12VerVerVID46506404569055019365304T12VerVerVIS1050038075280129022524604T12VerVerVLG28301730110200280009533204T12VerVerVOC5330-03059660-1350-04314274T12VerVerZEL66039001618
[MediaWiki-commits] [Gerrit] Allow editor to be wider in page view mode - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow editor to be wider in page view mode
..
Allow editor to be wider in page view mode
Bug: 46570
Change-Id: I9a2729ba4d338ab4d2f5d16555d56181bfbeb3ac
---
M resources/css/ext.translate.pagemode.css
M resources/css/ext.translate.proofread.css
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.pagemode.js
M resources/js/ext.translate.proofread.js
6 files changed, 83 insertions(+), 58 deletions(-)
Approvals:
Siebrand: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.pagemode.css
b/resources/css/ext.translate.pagemode.css
index 8d72124..4d8aa06 100644
--- a/resources/css/ext.translate.pagemode.css
+++ b/resources/css/ext.translate.pagemode.css
@@ -1,28 +1,35 @@
.ext-translate-container .tux-messagelist .tux-message-pagemode {
height: auto;
min-height: 50px;
- padding: 40px 0;
margin: 0 auto;
+ vertical-align: middle;
+ background: #FF;
+}
+
+.ext-translate-container .tux-messagelist .tux-message-pagemode
.tux-message-item-compact {
+ padding: 40px 0;
+ line-height: 50px;
+ overflow: hidden;
+ margin-right: auto;
+ margin-left: auto;
vertical-align: middle;
border-bottom: 1px solid #f0f0f0;
border-left: 1px solid #DD;
border-right: 1px solid #DD;
- max-width: 900px;
background: #FF;
+ max-width: 900px;
}
-.ext-translate-container .tux-messagelist .tux-message-pagemode:hover {
+.ext-translate-container .tux-messagelist .tux-message-pagemode
.tux-message-item-compact:hover {
background: #FCFCFC;
}
.ext-translate-container .tux-messagelist .tux-message-pagemode:first-child {
- margin-top: 10px;
padding-top: 60px;
border-top: 1px solid #DD;
}
.ext-translate-container .tux-messagelist .tux-message-pagemode:last-child {
- margin-bottom: 10px;
padding-bottom: 60px;
border-bottom: 1px solid #DD;
}
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index 0a4f253..e1ad24f 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -1,16 +1,26 @@
.ext-translate-container .tux-messagelist .tux-message-proofread {
height: auto;
min-height: 50px;
- padding: 40px 0;
margin: 0 auto;
+ vertical-align: middle;
+ background: #FF;
+}
+
+.ext-translate-container .tux-messagelist .tux-message-proofread
.tux-message-item-compact {
+ padding: 40px 0;
+ line-height: 50px;
+ overflow: hidden;
+ margin-right: auto;
+ margin-left: auto;
vertical-align: middle;
border-bottom: 1px solid #f0f0f0;
border-left: 1px solid #DD;
border-right: 1px solid #DD;
- max-width: 900px;
background: #FF;
+ max-width: 900px;
}
+
.ext-translate-container .tux-messagelist .tux-message-proofread:hover {
background: #FCFCFC;
}
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index e3797b5..41cb21d 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -6,7 +6,7 @@
this.$editor = null;
this.options = options;
this.message = this.options.message;
- this.$messageItem = this.$editTrigger.find( '.tux-message-item'
);
+ this.$messageItem = this.$editTrigger.find( '.message' );
this.shown = false;
this.dirty = false;
this.saving = false;
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index b99457f..145c649 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -192,7 +192,7 @@
.data( 'message', message );
$message = $( '' )
- .addClass( 'row tux-message-item ' + status )
+ .addClass( 'row message tux-message-item ' +
status )
.append(
$( '' )
.addClass( 'eight columns
tux-list-message' )
diff --git a/resources/js/ext.translate.pagemode.js
b/resources/js/ext.translate.pagemode.js
index 3af106e..316768b 100644
--- a/resources/js/ext.translate.pagemode.js
+++ b/resources/js/ext.translate.pagemode.js
@@ -45,24 +45,28 @@
this.$message.append(
$( '' )
- .addClass( 'one column
tux-pagemode-status ' + this.message.pro
[MediaWiki-commits] [Gerrit] Version update - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Version update .. Version update Change-Id: I52b4c9c7d5f8172dffe51c9fdfd1213f58d73b14 --- M UniversalLanguageSelector.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 840571e..b261599 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -25,7 +25,7 @@ /** * Version number used in extension credits and in other placed where needed. */ -define( 'ULS_VERSION', '2013-01-28' ); +define( 'ULS_VERSION', '2013-04-01' ); $wgExtensionCredits['other'][] = array( 'path' => __FILE__, -- To view, visit https://gerrit.wikimedia.org/r/56892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52b4c9c7d5f8172dffe51c9fdfd1213f58d73b14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 44210) Use the same user name for posting to all wikis - change (mediawiki...TranslationNotifications)
jenkins-bot has submitted this change and it was merged. Change subject: (bug 44210) Use the same user name for posting to all wikis .. (bug 44210) Use the same user name for posting to all wikis Change-Id: I4f8d5131e748f385e8b938b5c98551210d9ff609 --- M TranslationNotificationJob.php 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslationNotificationJob.php b/TranslationNotificationJob.php index b8942ae..177b18c 100644 --- a/TranslationNotificationJob.php +++ b/TranslationNotificationJob.php @@ -59,13 +59,14 @@ $text = $textContent . "\n" . $text; } - $editor = User::newFromID( $this->params['editor'] ); + + global $wgNotificationUsername; $status = $talkPage->doEditContent( ContentHandler::makeContent( $text, $this->title ), $this->params['editSummary'], $flags, false, - $editor + User::newFromName( $wgNotificationUsername ) ); return $status->isGood(); -- To view, visit https://gerrit.wikimedia.org/r/56896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f8d5131e748f385e8b938b5c98551210d9ff609 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TranslationNotifications Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Santhosh Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused variables and globals - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: Remove unused variables and globals
..
Remove unused variables and globals
bump to version 3.11 20130401
Also remove superfluous newlines, update some formatting and simplify two
if() statements.
Change-Id: Ie23d9cb0445bb113fddd7223af7858be97bf5890
---
M CHANGES
M OpenID.php
M SpecialOpenID.body.php
M SpecialOpenIDConvert.body.php
M SpecialOpenIDIdentifier.body.php
M SpecialOpenIDLogin.body.php
M SpecialOpenIDServer.body.php
M SpecialOpenIDXRDS.body.php
8 files changed, 23 insertions(+), 28 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CHANGES b/CHANGES
index 02edf74..c12bd87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.11 20130401 code cosmetics
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
diff --git a/OpenID.php b/OpenID.php
index 3fbcf83..875b428 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.10 20130318' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.11 20130401' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
diff --git a/SpecialOpenID.body.php b/SpecialOpenID.body.php
index 96c534f..6d721c0 100644
--- a/SpecialOpenID.body.php
+++ b/SpecialOpenID.body.php
@@ -20,6 +20,7 @@
*
* @file
* @author Evan Prodromou
+ * @author Thomas Gries
* @ingroup Extensions
*/
diff --git a/SpecialOpenIDConvert.body.php b/SpecialOpenIDConvert.body.php
index c0a788a..b69ebac 100644
--- a/SpecialOpenIDConvert.body.php
+++ b/SpecialOpenIDConvert.body.php
@@ -20,6 +20,7 @@
*
* @file
* @author Evan Prodromou
+ * @author Thomas Gries
* @ingroup Extensions
*/
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index d8270c4..48b8982 100644
--- a/SpecialOpenIDIdentifier.body.php
+++ b/SpecialOpenIDIdentifier.body.php
@@ -24,7 +24,6 @@
*/
class SpecialOpenIDIdentifier extends unlistedSpecialPage {
-
function __construct() {
parent::__construct( 'OpenIDIdentifier' );
}
@@ -39,7 +38,6 @@
}
self::showOpenIDIdentifier( User::newFromId( $par ), false,
true );
-
}
private static function isUser( $user ) {
@@ -47,21 +45,20 @@
}
/**
-* @param $user User
-* @param $delegate bool
+* @param User $user
+* @param bool $delegate
+* @param bool $showSpecialPageText
*/
public static function showOpenIDIdentifier( $user, $delegate = false,
$showSpecialPageText = false ) {
global $wgOut, $wgUser, $wgOpenIDClientOnly,
$wgOpenIDShowUrlOnUserPage,
- $wgOpenIDAllowServingOpenIDUserAccounts,
$wgOpenIDIdentifiersURL;
+ $wgOpenIDAllowServingOpenIDUserAccounts;
// show the own OpenID Url as a subtitle on the user page
// but only for the user when visiting their own page
// and when the options say so
- if ( !self::isUser( $user ) ) {
- if ( $showSpecialPageText ) {
- $wgOut->addWikiMsg(
'openid-identifier-page-text-no-such-local-openid' );
- }
+ if ( !self::isUser( $user ) && $showSpecialPageText ) {
+ $wgOut->addWikiMsg(
'openid-identifier-page-text-no-such-local-openid' );
return;
}
@@ -69,11 +66,10 @@
# Add OpenID data if its allowed
if ( !$wgOpenIDClientOnly ) {
-
if ( !( count( $openid )
&& ( strlen( $openid[0]->uoi_openid ) != 0 )
- && !$wgOpenIDAllowServingOpenIDUserAccounts ) )
{
-
+ && !$wgOpenIDAllowServingOpenIDUserAccounts )
+ ) {
$serverTitle = SpecialPage::getTitleFor(
'OpenIDServer' );
$serverUrl = $serverTitle->getFullURL();
$wgOut->addLink( array( 'rel' =>
'openid.server', 'href' => $serverUrl ) );
@@ -93,8 +89,8 @@
if ( ( $user->getID() === $wgUser->getID() )
&& ( $user->getID() != 0 )
[MediaWiki-commits] [Gerrit] Sort modules alphabetically - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Sort modules alphabetically .. Sort modules alphabetically Change-Id: Id8a0daabe6204e2a4c52d702e29d891fd80b89ae --- M Resources.php 1 file changed, 71 insertions(+), 67 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 3e6a461..cc6870b 100644 --- a/Resources.php +++ b/Resources.php @@ -7,6 +7,35 @@ */ /* Base ULS module */ +$wgResourceModules['ext.uls.displaysettings'] = array( + 'scripts' => 'resources/js/ext.uls.displaysettings.js', + 'styles' => 'resources/css/ext.uls.displaysettings.css', + 'localBasePath' => $dir, + 'dependencies' => array( + 'ext.uls.languagesettings', + 'ext.uls.webfonts', + 'jquery.i18n', + ), + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +$wgResourceModules['ext.uls.geoclient'] = array( + 'scripts' => 'resources/js/ext.uls.geoclient.js', + 'localBasePath' => $dir, + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +$wgResourceModules['ext.uls.ime'] = array( + 'scripts' => 'resources/js/ext.uls.ime.js', + 'localBasePath' => $dir, + 'remoteExtPath' => 'UniversalLanguageSelector', + 'dependencies' => array( + 'jquery.ime', + 'ext.uls.preferences', + ), +); + +// Base ULS module $wgResourceModules['ext.uls.init'] = array( 'scripts' => 'resources/js/ext.uls.init.js', 'styles' => 'resources/css/ext.uls.css', @@ -22,7 +51,20 @@ 'position' => 'top', ); -/* Interface language selection module */ + +$wgResourceModules['ext.uls.inputsettings'] = array( + 'scripts' => 'resources/js/ext.uls.inputsettings.js', + 'styles' => 'resources/css/ext.uls.inputsettings.css', + 'localBasePath' => $dir, + 'dependencies' => array( + 'ext.uls.languagesettings', + 'ext.uls.ime', + 'jquery.i18n', + ), + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +// Interface language selection module $wgResourceModules['ext.uls.interface'] = array( 'scripts' => 'resources/js/ext.uls.interface.js', 'localBasePath' => $dir, @@ -37,10 +79,14 @@ 'position' => 'top', ); -$wgResourceModules['ext.uls.geoclient'] = array( - 'scripts' => 'resources/js/ext.uls.geoclient.js', +$wgResourceModules['ext.uls.languagesettings'] = array( + 'scripts' => 'resources/js/ext.uls.languagesettings.js', + 'styles' => 'resources/css/ext.uls.languagesettings.css', 'localBasePath' => $dir, 'remoteExtPath' => 'UniversalLanguageSelector', + 'dependencies' => array( + 'ext.uls.preferences', + ), ); $wgResourceModules['ext.uls.preferences'] = array( @@ -54,16 +100,6 @@ ), ); -$wgResourceModules['ext.uls.languagesettings'] = array( - 'scripts' => 'resources/js/ext.uls.languagesettings.js', - 'styles' => 'resources/css/ext.uls.languagesettings.css', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', - 'dependencies' => array( - 'ext.uls.preferences', - ), -); - $wgResourceModules['ext.uls.webfonts'] = array( 'scripts' => 'resources/js/ext.uls.webfonts.js', 'localBasePath' => $dir, @@ -74,37 +110,26 @@ 'ext.uls.preferences', ), ); -$wgResourceModules['ext.uls.ime'] = array( - 'scripts' => 'resources/js/ext.uls.ime.js', - 'localBasePath' => $dir, - 'remoteExtPath' => 'UniversalLanguageSelector', - 'dependencies' => array( - 'jquery.ime', - 'ext.uls.preferences', - ), -); -$wgResourceModules['ext.uls.displaysettings'] = array( - 'scripts' => 'resources/js/ext.uls.displaysettings.js', - 'styles' => 'resources/css/ext.uls.displaysettings.css', +$wgResourceModules['ext.uls.webfonts.repository'] = array( + 'scripts' => 'resources/js/ext.uls.webfonts.repository.js', 'localBasePath' => $dir, - 'dependencies' => array( - 'ext.uls.languagesettings', - 'ext.uls.webfonts', - 'jquery.i18n', - ), 'remoteExtPath' => 'UniversalLanguageSelector', ); -$wgResourceModules['ext.uls.inputsettings'] = array( - 'scripts' => 'resources/js/ext.uls.inputsettings.js', - 'styles' => 'resources/css/ext.uls.inputsettings.css', + +$wgResourceModules['jquery.i18n'] = array( + 'scripts' => 'lib/jquery.i18n.js', 'localBasePath' => $dir, - 'dependencies' => array( - 'ext.uls.languagesettings', - 'ext.uls.ime', - 'jquery.i18n', + 'remoteExtPath' => 'UniversalLanguageSelector', +); + +$wgResourceModules['jquery.ime'] = array( + 'sc
[MediaWiki-commits] [Gerrit] Fix PHPDoc comments - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix PHPDoc comments
..
Fix PHPDoc comments
Change-Id: I7d6da503d909d06b9a10cb55144852e1c4d07569
---
M AbuseFilter.class.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 7f4e7b5..d4a408d 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -893,6 +893,7 @@
* @param $log_template
* @param $action
* @param $vars AbuseFilterVariableHolder
+* @param string $group
* @return mixed
*/
public static function addLogEntries( $actions_taken, $log_template,
$action, $vars, $group = 'default' ) {
@@ -1937,8 +1938,8 @@
}
/**
-* @param $title Title
-* @param $article Page|null
+* @param Title $title
+* @param null|Page $page
* @return AbuseFilterVariableHolder
*/
public static function getEditVars( $title, Page $page = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/56898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6da503d909d06b9a10cb55144852e1c4d07569
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Hoo man
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 Divehi fonts - change (mediawiki...WebFonts)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Divehi fonts
..
Add Divehi fonts
Bug: 46622
Change-Id: I0964e4d64a25d37190ea60bee04043fbd6a61091
---
A fonts/Thaa/FreeFont-Thaana-Bold.eot
A fonts/Thaa/FreeFont-Thaana-Bold.ttf
A fonts/Thaa/FreeFont-Thaana-Bold.woff
A fonts/Thaa/FreeFont-Thaana.eot
A fonts/Thaa/FreeFont-Thaana.ttf
A fonts/Thaa/FreeFont-Thaana.woff
M resources/ext.webfonts.fontlist.js
7 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/fonts/Thaa/FreeFont-Thaana-Bold.eot
b/fonts/Thaa/FreeFont-Thaana-Bold.eot
new file mode 100644
index 000..9b04d36
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana-Bold.eot
Binary files differ
diff --git a/fonts/Thaa/FreeFont-Thaana-Bold.ttf
b/fonts/Thaa/FreeFont-Thaana-Bold.ttf
new file mode 100644
index 000..c825f6f
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana-Bold.ttf
Binary files differ
diff --git a/fonts/Thaa/FreeFont-Thaana-Bold.woff
b/fonts/Thaa/FreeFont-Thaana-Bold.woff
new file mode 100644
index 000..93c256b
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana-Bold.woff
Binary files differ
diff --git a/fonts/Thaa/FreeFont-Thaana.eot b/fonts/Thaa/FreeFont-Thaana.eot
new file mode 100644
index 000..9eaaf78
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana.eot
Binary files differ
diff --git a/fonts/Thaa/FreeFont-Thaana.ttf b/fonts/Thaa/FreeFont-Thaana.ttf
new file mode 100644
index 000..b5994ee
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana.ttf
Binary files differ
diff --git a/fonts/Thaa/FreeFont-Thaana.woff b/fonts/Thaa/FreeFont-Thaana.woff
new file mode 100644
index 000..ffc0cdc
--- /dev/null
+++ b/fonts/Thaa/FreeFont-Thaana.woff
Binary files differ
diff --git a/resources/ext.webfonts.fontlist.js
b/resources/ext.webfonts.fontlist.js
index 4935a4c..280aa4b 100644
--- a/resources/ext.webfonts.fontlist.js
+++ b/resources/ext.webfonts.fontlist.js
@@ -462,6 +462,25 @@
ttf: "Latn/UnifrakturMaguntia.ttf",
woff: "Latn/UnifrakturMaguntia.woff",
version: "2012-02-11"
+ },
+
+ "FreeFontThaana": {
+ eot: "Thaa/FreeFont-Thaana.eot",
+ ttf: "Thaa/FreeFont-Thaana.ttf",
+ woff: "Thaa/FreeFont-Thaana.woff",
+ version: "1.0",
+ variants: {
+ bold: "FreeFontThaana Bold"
+ }
+ },
+
+ "FreeFontThaana Bold": {
+ eot: "Thaa/FreeFont-Thaana-Bold.eot",
+ ttf: "Thaa/FreeFont-Thaana-Bold.ttf",
+ woff: "Thaa/FreeFont-Thaana-Bold.woff",
+ version: "1.0",
+ fontweight: "bold",
+ fontstyle: "normal",
}
/*
@@ -491,6 +510,7 @@
bpy: [ "Siyam Rupali", "Lohit Bengali" ],
bug: [ "Saweri" ],
cdo: [ "Charis SIL" ],
+ dv: [ "FreeFontThaana" ],
dz: [ "Jomolhari" ],
fa: [ "Iranian Sans", "Amiri" ],
gu: [ "Lohit Gujarati" ],
--
To view, visit https://gerrit.wikimedia.org/r/56779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0964e4d64a25d37190ea60bee04043fbd6a61091
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WebFonts
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Divehi font - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Divehi font
..
Add Divehi font
Using the font from GNU FreeFont(subset)
Bug: 42812
Change-Id: I55c5045ac764d9a40e7ee9b7e9881414816863f4
---
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.eot
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.ttf
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.eot
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.ttf
A data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff
A data/fontrepo/fonts/FreeFontThana/font.ini
M resources/js/ext.uls.webfonts.repository.js
8 files changed, 18 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.eot
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.eot
new file mode 100644
index 000..9b04d36
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.eot
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.ttf
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.ttf
new file mode 100644
index 000..c825f6f
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff
new file mode 100644
index 000..93c256b
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana-Bold.woff
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.eot
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.eot
new file mode 100644
index 000..9eaaf78
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.eot
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.ttf
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.ttf
new file mode 100644
index 000..b5994ee
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff
b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff
new file mode 100644
index 000..ffc0cdc
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/FreeFont-Thaana.woff
Binary files differ
diff --git a/data/fontrepo/fonts/FreeFontThana/font.ini
b/data/fontrepo/fonts/FreeFontThana/font.ini
new file mode 100644
index 000..7e2fda8
--- /dev/null
+++ b/data/fontrepo/fonts/FreeFontThana/font.ini
@@ -0,0 +1,17 @@
+[FreeFont-Thaana]
+languages=dv*
+version=1.0
+license=GPL 3
+licensefile=gpl-3.0.txt
+url=www.gnu.org/software/freefont
+ttf=FreeFont-Thaana.ttf
+eot=FreeFont-Thaana.eot
+woff=FreeFont-Thaana.woff
+bold=FreeFont-Thaana Bold
+
+[FreeFont-Thaana Bold]
+ttf=FreeFont-Thaana-Bold.ttf
+eot=FreeFont-Thaana-Bold.eot
+woff=FreeFont-Thaana-Bold.woff
+fontweight=bold
+
diff --git a/resources/js/ext.uls.webfonts.repository.js
b/resources/js/ext.uls.webfonts.repository.js
index cbc109c..e03e925 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","Alef"],"he":["system","Alef","Miriam CLM","Taamey Frank
CLM"],"hi":["Lohit
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"jv":["system","Tuladha
Jejeg"],"jv-java":["Tuladha
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
Kannada","Gubbi"],"kok":["Lohit
[MediaWiki-commits] [Gerrit] Replace 2 deprecated methods - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace 2 deprecated methods
..
Replace 2 deprecated methods
Change-Id: I8e420f0259ef6c9e579f7a00beb58f28af9da37d
---
M AbuseFilterVariableHolder.php
M special/SpecialAbuseLog.php
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index 812712a..2c43451 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -352,13 +352,14 @@
$article = $parameters['article'];
if ( $article !== null
&& ( !defined(
'MW_SUPPORTS_CONTENTHANDLER' )
- || $article->getContentModel()
=== CONTENT_MODEL_WIKITEXT ) ) {
-
+ || $article->getContentModel()
=== CONTENT_MODEL_WIKITEXT )
+ ) {
$textVar = $parameters['text-var'];
// XXX: Use prepareContentForEdit. But
we need a Content object for that.
$new_text = $vars->getVar( $textVar
)->toString();
- $editInfo =
$article->prepareTextForEdit( $new_text );
+ $content = ContentHandler::makeContent(
$new_text, $article->getTitle() );
+ $editInfo =
$article->prepareContentForEdit( $content );
$links = array_keys(
$editInfo->output->getExternalLinks() );
$result = $links;
break;
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 38a0f15..2774c27 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -308,7 +308,7 @@
$diffEngine = new DifferenceEngine;
$diffEngine->showDiffStyle();
- $formattedDiff = $diffEngine->generateDiffBody(
$old_wikitext, $new_wikitext );
+ $formattedDiff = $diffEngine->generateTextDiffBody(
$old_wikitext, $new_wikitext );
static $colDescriptions = "
--
To view, visit https://gerrit.wikimedia.org/r/56899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e420f0259ef6c9e579f7a00beb58f28af9da37d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Hoo man
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 39075) Add a 'Preview' button to the notification form - change (mediawiki...TranslationNotifications)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56914
Change subject: (bug 39075) Add a 'Preview' button to the notification form
..
(bug 39075) Add a 'Preview' button to the notification form
Change-Id: I803484ca2eb768d89d4c6b8172e6aa14b7c3884a
---
M TranslationNotifications.i18n.php
M TranslationNotifications.php
M resources/ext.translationnotifications.notifytranslators.js
3 files changed, 96 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/14/56914/1
diff --git a/TranslationNotifications.i18n.php
b/TranslationNotifications.i18n.php
index e6e7e5e..8bcc416 100644
--- a/TranslationNotifications.i18n.php
+++ b/TranslationNotifications.i18n.php
@@ -44,6 +44,7 @@
'notifytranslators' => 'Notify translators',
'translationnotifications-submit-ok' => 'Notifications have been added
to a queue and are delivered by a background job.',
'translationnotifications-send-notification-button' => 'Send a
notification to translators',
+ 'translationnotifications-preview-notification-button' => 'Preview the
notification',
'translationnotifications-deadline-label' => 'Deadline to indicate in
this notification:',
'translationnotifications-languages-to-notify-label' => 'Which
languages to notify:',
'translationnotifications-languages-to-notify-label-help-message' =>
'Comma-separated language codes; leave blank to notify for all languages.',
@@ -124,7 +125,9 @@
'translationnotifications-sent-body' => 'Translation notification was
sent.',
'translationnotifications-log-alllanguages' => 'all languages',
'translationnotifications-nodeadline' => 'none',
- 'translationnotifications-signup-legal' => 'You agree that by providing
this information we may contact you regarding topics related to {{SITENAME}} we
think may be of interest to you. You agree your data is subject to our
[[{{MediaWiki:Privacypage}}|privacy policy]].'
+ 'translationnotifications-signup-legal' => 'You agree that by providing
this information we may contact you regarding topics related to {{SITENAME}} we
think may be of interest to you. You agree your data is subject to our
[[{{MediaWiki:Privacypage}}|privacy policy]].',
+
+ 'translationnotifications-generic-languages' => '',
);
/** Message documentation (Message documentation)
@@ -169,6 +172,7 @@
'translationnotifications-signup-success' => 'A message that appears on
the top of Special:TranslatorSignup after saving the preferences.',
'notifytranslators' => '{{doc-special|NotifyTranslators}}',
'translationnotifications-send-notification-button' => 'A title for the
submit button of the translator notification form.',
+ 'translationnotifications-preview-notification-button' => 'A title for
the preview button. Pressing the button shows the previewed notification below
the form.',
'translationnotifications-deadline-label' => 'A label for the deadline
field, which will have a datepicker.',
'translationnotifications-languages-to-notify-label' => 'A label for
language codes field.',
'translationnotifications-priority' => 'A label for translation
priority field.
@@ -194,7 +198,7 @@
* $9 - Number of languages. Can be used in PLURAL.
* $10- Plain text username used for GENDER.",
'translationnotifications-talkpage-body' => "The body of the
notification on user talk page.
-
+* $1 - Plain user name, can be used for GENDER.
* $2 - Translator's username or real name, if specified.
* $3 - A comma list of language names.
* $4 - Translatable page name.
@@ -236,6 +240,7 @@
'translationnotifications-nodeadline' => 'Appears in the log message,
saying that no deadline was specified. Traduction en français : "aucune" (date
limite).
{{Identical|None}}',
'translationnotifications-signup-legal' => 'Legal text shown at the
bottom of [[Special:TranslatorSignup]] page.',
+ 'translationnotifications-generic-languages' => 'A generic placeholder
that is shown in the previewed notification instead of a list of language
names.',
);
/** Arabic (العربية)
@@ -1626,6 +1631,7 @@
'notifytranslators' => 'מכתבים למתרגמים',
'translationnotifications-submit-ok' => 'ההודעות נוספו לתור המשימות
ויישלחו על־ידי משימת רקע.',
'translationnotifications-send-notification-button' => 'שליחת מכתבים
למתרגמים',
+ 'translationnotifications-preview-notification-button' => 'תצוגה
מקדימה',
'translationnotifications-deadline-label' => 'תאריך סופי שיתווסף
להודעה:',
'translationnotifications-languages-to-notify-label' => 'רשימת שפות
שהמתרגמים אליהן יקבלו את ההודעה:',
'translationnotifications-languages-to-notify-label-help-message' =>
'רשימה מופרדת בפסיקים של קודי שפה; אם השדה יהיה ריק, ההודעה תישלח לדוברי כל
הש
[MediaWiki-commits] [Gerrit] Disable translation for ArticleFeedback - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Disable translation for ArticleFeedback .. Disable translation for ArticleFeedback No longer maintained by or deployed at Wikimedia. No other known maintainers. Change-Id: Ib0811cdcb250e7b8c85ad0fdb7c043db4586bcd1 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 8123843..459f0fc 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -49,11 +49,12 @@ Arrays -Article Feedback -aliasfile = ArticleFeedback/ArticleFeedback.alias.php -optional = articlefeedback-form-panel-helpimprove-email-placeholder -optional = articlefeedback-table-noratings -ignored = articlefeedback-pitch-edit-body +# Unmaintained by Wikimedia, no longer deployed. +#Article Feedback +#aliasfile = ArticleFeedback/ArticleFeedback.alias.php +#optional = articlefeedback-form-panel-helpimprove-email-placeholder +#optional = articlefeedback-table-noratings +#ignored = articlefeedback-pitch-edit-body Article Feedback v5 aliasfile = ArticleFeedbackv5/ArticleFeedbackv5.alias.php -- To view, visit https://gerrit.wikimedia.org/r/56907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0811cdcb250e7b8c85ad0fdb7c043db4586bcd1 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize line endings - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Normalize line endings
..
Normalize line endings
Follow up to If29c536a26181aacc7c957a7f7112593fc574121 .
Fixing it when creating the announcement, too.
Change-Id: Iab78a466eb773e8d70ae07ab69c6b9039d0994e8
---
M melange/BundleCreater.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/melange/BundleCreater.php b/melange/BundleCreater.php
index dc75039..5c412ed 100644
--- a/melange/BundleCreater.php
+++ b/melange/BundleCreater.php
@@ -306,7 +306,7 @@
foreach ( $this->conf['extensions'] as $ext => $checkout ) {
$notefile = $this->dir . "/notes/$version-$ext";
- $contents = file_get_contents( $notefile );
+ $contents = str_replace( array( "\r\n", "\r" ), "\n",
file_get_contents( $notefile ) );
preg_match( '/^#---$(.*)^#---$/msU', $contents,
$matches );
if ( !isset( $matches[1] ) ) {
echo "Could not parse notes for extension
$ext\n";
--
To view, visit https://gerrit.wikimedia.org/r/56718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab78a466eb773e8d70ae07ab69c6b9039d0994e8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use getIcon utility method from Translate - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Use getIcon utility method from Translate
..
Use getIcon utility method from Translate
Change-Id: I7182b9ca3bc138f99e3e7f23779210825e6a4f0d
Depends: I24fb73e31ab9433bb6046014e5e6937910a8f8e4
---
M MainPage/ProjectHandler.php
M MainPage/specials/SpecialTwnMainPage.php
2 files changed, 1 insertion(+), 30 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MainPage/ProjectHandler.php b/MainPage/ProjectHandler.php
index b5c3163..413f71d 100644
--- a/MainPage/ProjectHandler.php
+++ b/MainPage/ProjectHandler.php
@@ -55,33 +55,4 @@
} );
}
- // @todo FIXME: This is duplicate code Translate -
ApiQueryMessageGroup. We can avoid
- // duplication if we make getIcon of that API public static.
- public static function getIcon( MessageGroup $g, $size ) {
- global $wgServer;
- $icon = $g->getIcon();
- if ( substr( $icon, 0, 7 ) !== 'wiki://' ) {
- return null;
- }
-
- $formats = array();
-
- $filename = substr( $icon, 7 );
- $file = wfFindFile( $filename );
- if ( !$file ) {
- return '';
- }
-
- if ( $file->isVectorized() ) {
- $formats['vector'] = $file->getUrl();
- }
-
- $formats['raster'] = $wgServer . $file->createThumb( $size,
$size );
-
- foreach ( $formats as $key => &$url ) {
- $url = wfExpandUrl( $url, PROTO_RELATIVE );
- }
-
- return $formats;
- }
}
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index 7074a8b..e6c3be3 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -98,7 +98,7 @@
ProjectHandler::sortByPriority( $projects,
$this->getLanguage()->getCode() );
foreach ( $projects as $group ) {
- $urls = ProjectHandler::getIcon( $group, 100 );
+ $urls = TranslateUtils::getIcon( $group, 100 );
if ( isset( $urls['vector'] ) ) {
$url = $urls['vector'];
} elseif ( isset( $urls['raster'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/56376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7182b9ca3bc138f99e3e7f23779210825e6a4f0d
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix pretty JSON when strings end with backslashes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix pretty JSON when strings end with backslashes
..
Fix pretty JSON when strings end with backslashes
If a string encoded as part of the output ends in a backslash
(e.g. an edit token), FormatJson::prettyPrint() may incorrectly
treat the unescaped double quote marking the end of the string as
a character that is part of the string.
This is a serious problem in that the "pretty" output may not
necessarily be valid JSON; a later string literal might contain
one or more of these tokens: :[{,]}
To fix the bug, I exploit strtr's behavior when it is given an
associative array having keys of the same length to skip over
escaped backslashes while replacing escaped double quotes with "\x01".
I also updated the corresponding unit test.
Change-Id: I159105b6493c14b82cd0a41a95e04bfed744931e
---
M includes/json/FormatJson.php
M tests/phpunit/includes/json/FormatJsonTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 013d589..bdf98d5 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -168,7 +168,7 @@
private static function prettyPrint( $json ) {
$buf = '';
$indent = 0;
- $json = str_replace( '\"', "\x01", $json );
+ $json = strtr( $json, array( '' => '', '\"' => "\x01" )
);
for ( $i = 0, $n = strlen( $json ); $i < $n; $i += $skip ) {
$skip = 1;
switch ( $json[$i] ) {
diff --git a/tests/phpunit/includes/json/FormatJsonTest.php
b/tests/phpunit/includes/json/FormatJsonTest.php
index 9e25e18..0782e4e 100644
--- a/tests/phpunit/includes/json/FormatJsonTest.php
+++ b/tests/phpunit/includes/json/FormatJsonTest.php
@@ -6,7 +6,7 @@
$obj = array(
'emptyObject' => new stdClass,
'emptyArray' => array(),
- 'string' => 'foobar',
+ 'string' => 'foobar\\',
'filledArray' => array(
array(
123,
@@ -24,7 +24,7 @@
"emptyArray": [
],
-"string": "foobar",
+"string": "foobar",
"filledArray": [
[
123,
--
To view, visit https://gerrit.wikimedia.org/r/56357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I159105b6493c14b82cd0a41a95e04bfed744931e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More CSS adjustments, link corrections - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: More CSS adjustments, link corrections
..
More CSS adjustments, link corrections
Change-Id: Idf038c19d8ee73c0e22d99780db908f21a143b96
---
M MainPage/Resources.php
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/resources/js/ext.translate.mainpage.js
M MainPage/specials/SpecialTwnMainPage.php
4 files changed, 61 insertions(+), 14 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MainPage/Resources.php b/MainPage/Resources.php
index 7eed1d9..fe617f1 100644
--- a/MainPage/Resources.php
+++ b/MainPage/Resources.php
@@ -18,6 +18,8 @@
'jquery.uls.grid',
'jquery.uls',
'ext.translate.statsbar',
+ 'mediawiki.util',
+ 'mediawiki.Uri',
),
'position' => 'top',
) + $resourcePaths;
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index 122aefc..6f98a76 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -10,7 +10,10 @@
}
.twn-mainpage-header .uls-trigger {
- padding-left: 20px;
+ background-position: bottom left;
+ padding-left: 30px;
+ color: #3366BB;
+ padding-top: 50px;
}
.twn-mainpage-title { /* @embed */
@@ -20,22 +23,30 @@
height: 75px;
}
-.twn-mainpage-title .twn-brand-name,
+.twn-mainpage-title .twn-brand-name {
+ padding-left: 50px;
+ padding-top: 20px;
+ font-size: 24px;
+}
+
.twn-mainpage-title .twn-brand-motto {
padding-left: 50px;
+ padding-top: 5px;
+ font-size: 16px;
}
.twn-mainpage-header {
- border-bottom: 2px solid blue;
- height: 100px;
+ border-bottom: 2px solid #3366BB;
}
.twn-mainpage-header .login {
float: right;
+ color: #3366BB;
+ padding-top: 50px;
}
.twn-mainpage-banner {
- min-height: 300px;
+ min-height: 500px;
background: transparent url('../banners/dance.jpg') no-repeat scroll
left 40%;
background-size: 100%;
}
@@ -50,12 +61,13 @@
}
.stats-tile {
- background-color: blue;
+ background-color: #3366BB;
color: white;
height: 130px;
margin: auto;
max-width: 130px;
padding: 10px;
+ opacity: 0.9;
}
.unused.stats-tile {
@@ -105,8 +117,8 @@
}
.twn-mainpage-footer {
- background-color: rgb(190, 181, 181);
- height: 100px;
+ background-color: #bb;
+ height: 50px;
font-size: 16px;
padding: 10px;
margin: 10px;
@@ -117,6 +129,10 @@
margin: 10px;
padding: 10px;
height: 200px;
+}
+
+.project-tile:hover {
+ border: 2px solid #3366BB;
}
.project-icon {
@@ -209,3 +225,8 @@
border-top: 1px solid black;
border-bottom: 1px solid black;
}
+
+.twn-mainpage-footer a {
+ text-align: center;
+ color: #3366BB;
+}
diff --git a/MainPage/resources/js/ext.translate.mainpage.js
b/MainPage/resources/js/ext.translate.mainpage.js
index c767de8..d71466c 100644
--- a/MainPage/resources/js/ext.translate.mainpage.js
+++ b/MainPage/resources/js/ext.translate.mainpage.js
@@ -1 +1,10 @@
-//test
\ No newline at end of file
+( function ( $, mw ) {
+ 'use strict';
+
+ $( document ).ready( function () {
+ $( '.twn-mainpage-search button' ).on( 'click', function () {
+ window.location.href = new mw.Uri( mw.util.wikiGetlink(
'Special:SearchTranslations' ) )
+ .extend( { query: $( 'input.searchbox' ).val()
} );
+ } );
+ } );
+}( jQuery, mediaWiki ) );
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index e6c3be3..d794210 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -41,6 +41,8 @@
}
public function header() {
+ global $wgScript;
+
$out = Html::openElement( 'div', array( 'class' => 'row
twn-mainpage-header' ) );
$out .= Html::openElement( 'div', array( 'class' => 'ten
columns twn-mainpage-title' ) );
$out .= Html::element( 'div',
@@ -62,6 +64,7 @@
$out .= Html::element( 'a',
array(
'class' => 'login column text-right',
+ 'href' =>
"$wgScript?title=Special:UserLogin&returnto=Special%3AMainPage",
)
, 'Login' );
$out .= Html::closeElement( 'div' );
@@ -72,12 +75,13 @@
$out = Html::openElement( 'div', array( 'class' => 'row
twn-mainpage-search' ) );
$out .= Html::element( 'span',
[MediaWiki-commits] [Gerrit] Remove leading spaces in two messages - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove leading spaces in two messages
..
Remove leading spaces in two messages
Also replace two hard coded space by a word separator.
Spotted by 아라 in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Upload_source_url/en
Change-Id: If3fbe2ed9b2bd7e156cc31055e9c74da3d79240a
---
M includes/specials/SpecialUpload.php
M languages/messages/MessagesEn.php
2 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 89c06b2..b665c4b 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -843,10 +843,13 @@
'upload-type' => 'File',
'radio' => &$radio,
'help' => $this->msg( 'upload-maxfilesize',
-
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['file'] )
- )->parse() . ' ' . $this->msg(
'upload_source_file' )->escaped(),
+ $this->getContext()->getLanguage()->formatSize(
$this->mMaxUploadSize['file'] ) )
+ ->parse() .
+ $this->msg( 'word-separator' )->escaped() .
+ $this->msg( 'upload_source_file' )->escaped(),
'checked' => $selectedSourceType == 'file',
);
+
if ( $canUploadByUrl ) {
$this->mMaxUploadSize['url'] =
UploadBase::getMaxUploadSize( 'url' );
$descriptor['UploadFileURL'] = array(
@@ -857,8 +860,10 @@
'upload-type' => 'url',
'radio' => &$radio,
'help' => $this->msg( 'upload-maxfilesize',
-
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] )
- )->parse() . ' ' . $this->msg(
'upload_source_url' )->escaped(),
+
$this->getContext()->getLanguage()->formatSize( $this->mMaxUploadSize['url'] ) )
+ ->parse() .
+ $this->msg( 'word-separator'
)->escaped() .
+ $this->msg( 'upload_source_url'
)->escaped(),
'checked' => $selectedSourceType == 'url',
);
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 9de6aaf..d95f195 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2414,8 +2414,8 @@
'nolicense' => 'None selected',
'licenses' => '-', # do not translate or duplicate this message to
other languages
'license-nopreview' => '(Preview not available)',
-'upload_source_url' => ' (a valid, publicly accessible URL)',
-'upload_source_file' => ' (a file on your computer)',
+'upload_source_url' => '(a valid, publicly accessible URL)',
+'upload_source_file' => '(a file on your computer)',
# Special:ListFiles
'listfiles-summary' => 'This special page shows all uploaded files.
--
To view, visit https://gerrit.wikimedia.org/r/56900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3fbe2ed9b2bd7e156cc31055e9c74da3d79240a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Swift: add rewrites for legacy math URLs - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: Swift: add rewrites for legacy math URLs .. Swift: add rewrites for legacy math URLs Project/lang math URLs were deprecated quite a while ago but we're still getting a considerable amount of hits to them (which right now are not routed to Swift at all). Expand the regexp to cover those too, but map them still to the global containers. Change-Id: I3c454490b9f9dbc8baf8158566f1c65fa848e6f5 --- M files/swift/SwiftMedia/wmf/rewrite.py 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/swift/SwiftMedia/wmf/rewrite.py b/files/swift/SwiftMedia/wmf/rewrite.py index db14f75..ef30cd8 100644 --- a/files/swift/SwiftMedia/wmf/rewrite.py +++ b/files/swift/SwiftMedia/wmf/rewrite.py @@ -190,8 +190,10 @@ # (d) global-data-repo-zone.shard (if sharded) # # Rewrite wiki-global URLs of these forms: -# (a) http://upload.wikimedia.org/math/.* -# => http://msfe/v1/AUTH_/global-data-math-render/.* +# (a) http://upload.wikimedia.org/math/ +# => http://msfe/v1/AUTH_/global-data-math-render/ +# (b) http://upload.wikimedia.org///math/ (legacy) +# => http://msfe/v1/AUTH_/global-data-math-render/ # # Rewrite wiki-relative URLs of these forms: # (a) http://upload.wikimedia.org/// @@ -238,7 +240,9 @@ # math renderings if match is None: # /math/c/9/f/c9f2055dadfb49853eff822a453d9ceb.png -match = re.match(r'^/(?Pmath)/(?P(?P[0-9a-f])/(?P[0-9a-f])/.+)$', req.path) +# /wikipedia/en/math/c/9/f/c9f2055dadfb49853eff822a453d9ceb.png (legacy) +match = re.match(r'^(/(?P[^/]+)/(?P[^/]+))?/(?Pmath)/(?P(?P[0-9a-f])/(?P[0-9a-f])/.+)$', req.path) + if match: proj = 'global' lang = 'data' -- To view, visit https://gerrit.wikimedia.org/r/56912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c454490b9f9dbc8baf8158566f1c65fa848e6f5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Gerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Faidon Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Installer can now customize the logo in LocalSettings.php - change (mediawiki/core)
MarkAHershberger has submitted this change and it was merged.
Change subject: Installer can now customize the logo in LocalSettings.php
..
Installer can now customize the logo in LocalSettings.php
Bug: 40617
Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
---
M includes/installer/Installer.i18n.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerPage.php
3 files changed, 10 insertions(+), 3 deletions(-)
Approvals:
MarkAHershberger: Verified; Looks good to me, approved
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index 02f0c47..5e36a60 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -455,6 +455,8 @@
'config-logo-help'=> "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
Upload an image of the appropriate size, and enter the URL here.
+You can use \$wgStylePath or \$wgScriptPath if your logo is relative to those
paths.
+
If you do not want a logo, leave this box blank.",
'config-instantcommons' => 'Enable Instant Commons',
'config-instantcommons-help' =>
'[//www.mediawiki.org/wiki/InstantCommons Instant Commons] is a feature that
allows wikis to use images, sounds and other media found on the
[//commons.wikimedia.org/ Wikimedia Commons] site.
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index aa7fc97..cf45dcb 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -62,12 +62,12 @@
'wgRightsText', 'wgMainCacheType',
'wgEnableUploads',
'wgMainCacheType', '_MemCachedServers',
'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons',
'wgUpgradeKey', 'wgDefaultSkin',
- 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength'
+ 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength', 'wgLogo',
),
$db->getGlobalNames()
);
- $unescaped = array( 'wgRightsIcon' );
+ $unescaped = array( 'wgRightsIcon', 'wgLogo' );
$boolItems = array(
'wgEnableEmail', 'wgEnableUserEmail',
'wgEnotifUserTalk',
'wgEnotifWatchlist', 'wgEmailAuthentication',
'wgEnableUploads', 'wgUseInstantCommons'
@@ -273,7 +273,7 @@
## The relative URL path to the logo. Make sure you change this from the
default,
## or else you'll overwrite your logo when you upgrade!
-\$wgLogo = \"\$wgStylePath/common/images/wiki.png\";
+\$wgLogo = \"{$this->values['wgLogo']}\";
## UPO means: this is also a user preference option
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 305c012..593509e 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -933,6 +933,10 @@
$this->getVar( 'wgDeletedDirectory' )
)
);
+ // If we're using the default, let the user set it relative to
$wgScriptPath
+ $curLogo = $this->getVar( 'wgLogo' );
+ $logoString = ( $curLogo ==
"/wiki/skins/common/images/wiki.png" ) ?
+ '$wgStylePath/common/images/wiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' :
'display: none';
$this->addHTML(
@@ -954,6 +958,7 @@
'' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
+ 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox(
'config-logo-help' )
--
To view, visit https://gerrit.wikimedia.org/r/25761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Demon
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: MarkAHershberger
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Script tag for LinearData test not renamed after file move. - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/56915 Change subject: Script tag for LinearData test not renamed after file move. .. Script tag for LinearData test not renamed after file move. Change-Id: I89f7c2afd815f3050a2d837de67189cd628c03c6 --- M modules/ve/test/index.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/15/56915/1 diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php index 1d941b9..9d35824 100644 --- a/modules/ve/test/index.php +++ b/modules/ve/test/index.php @@ -232,13 +232,13 @@ + - -- To view, visit https://gerrit.wikimedia.org/r/56915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89f7c2afd815f3050a2d837de67189cd628c03c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate trailing newlines out of nodes with auto-inserted en... - change (mediawiki...Parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56916
Change subject: Migrate trailing newlines out of nodes with auto-inserted end
tags
..
Migrate trailing newlines out of nodes with auto-inserted end tags
* If a node has its end-tag autoinserted, then it is safe to
migrated trailing newlines out of it. The serializer works best
when trailing newlines are outside HTML nodes, and this is part
of the series of fixes trying to get the DOM to conform to that.
Should we make the serializer more robust and not rely on this
assumption (ex: parsoid clients, VE)?
* Fixes the following snippet from: en:World of our own which itself
has fewer RT errors
{|
|
a
|}
* No change in parser test results (TODO: add new tests).
Change-Id: I82e73c8527bfcd52d72cdd7bfbf71bed9b88852b
---
M js/lib/mediawiki.DOMPostProcessor.js
1 file changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/16/56916/1
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 8d4b21c..38fdcfe 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -652,12 +652,18 @@
// Migrate trailing newlines out of
function migrateTrailingNLs(elt, env) {
- // If a node ends a line in wikitext, or if it is the last node in
- // the DOM subtree rooted at a node that ends a line in wikitext, we
- // should migrate the newline out of it.
+
+ // We can migrate a newline out of a node if one of the following is
true:
+ // (1) The ends a line in wikitext (=> not a literal html tag)
+ // (2) The node has an auto-closed end-tag (wikitext-generated or
literal html tag)
+ // (3) It is the rightmost node in the DOM subtree rooted at a node
+ // that ends a line in wikitext
function canMigrateNLOutOfNode(node) {
// These nodes either end a line in wikitext (tr, li, dd, ol,
ul, dl, caption, p)
// or have implicit closing tags that can leak newlines to
those that end a line (th, td)
+ //
+ // SSS FIXME: Given condition 2, we may not need to check th/td
anymore
+ // (if we can rely on auto inserted start/end tags being
present always).
var nodesToMigrateFrom = Util.arrayToHash([
"th", "td", "tr", "li", "dd", "ol", "ul", "dl",
"caption", "p"
]);
@@ -666,7 +672,11 @@
return nodesToMigrateFrom[node.nodeName.toLowerCase()]
&& !DU.isLiteralHTMLNode(node);
}
- return node && (nodeEndsLineInWT(node) || (!node.nextSibling &&
canMigrateNLOutOfNode(node.parentNode)));
+ return node && (
+ nodeEndsLineInWT(node) ||
+ (DU.isElt(node) &&
DU.dataParsoid(node).autoInsertedEnd) ||
+ (!node.nextSibling &&
canMigrateNLOutOfNode(node.parentNode))
+ );
}
// A node has zero wt width if:
--
To view, visit https://gerrit.wikimedia.org/r/56916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82e73c8527bfcd52d72cdd7bfbf71bed9b88852b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Installer can now customize the logo in LocalSettings.php - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56917
Change subject: Installer can now customize the logo in LocalSettings.php
..
Installer can now customize the logo in LocalSettings.php
Bug: 40617
Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
---
M RELEASE-NOTES-1.21
M includes/installer/Installer.i18n.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerPage.php
4 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/56917/1
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 295eb7b..94eade7 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -122,6 +122,7 @@
quotmarks, order and whitespace in the attribute list).
=== Bug fixes in 1.21 ===
+* (bug 40617) Installer can now customize the logo in LocalSettings.php
* (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
* (bug 40352) fixDoubleRedirects.php should support interwiki redirects.
* (bug 9237) SpecialBrokenRedirect should not list interwiki redirects.
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index ef055de..216ec57 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -455,6 +455,8 @@
'config-logo-help'=> "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
Upload an image of the appropriate size, and enter the URL here.
+You can use \$wgStylePath or \$wgScriptPath if your logo is relative to those
paths.
+
If you do not want a logo, leave this box blank.",
'config-instantcommons' => 'Enable Instant Commons',
'config-instantcommons-help' =>
'[//www.mediawiki.org/wiki/InstantCommons Instant Commons] is a feature that
allows wikis to use images, sounds and other media found on the
[//commons.wikimedia.org/ Wikimedia Commons] site.
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 7cb3779..72ea3db 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -62,12 +62,12 @@
'wgRightsText', 'wgMainCacheType',
'wgEnableUploads',
'wgMainCacheType', '_MemCachedServers',
'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons',
'wgUpgradeKey', 'wgDefaultSkin',
- 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength'
+ 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength', 'wgLogo',
),
$db->getGlobalNames()
);
- $unescaped = array( 'wgRightsIcon' );
+ $unescaped = array( 'wgRightsIcon', 'wgLogo' );
$boolItems = array(
'wgEnableEmail', 'wgEnableUserEmail',
'wgEnotifUserTalk',
'wgEnotifWatchlist', 'wgEmailAuthentication',
'wgEnableUploads', 'wgUseInstantCommons'
@@ -273,7 +273,7 @@
## The relative URL path to the logo. Make sure you change this from the
default,
## or else you'll overwrite your logo when you upgrade!
-\$wgLogo = \"\$wgStylePath/common/images/wiki.png\";
+\$wgLogo = \"{$this->values['wgLogo']}\";
## UPO means: this is also a user preference option
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index f352cf1..085456d 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -912,6 +912,10 @@
$this->getVar( 'wgDeletedDirectory' )
)
);
+ // If we're using the default, let the user set it relative to
$wgScriptPath
+ $curLogo = $this->getVar( 'wgLogo' );
+ $logoString = ( $curLogo ==
"/wiki/skins/common/images/wiki.png" ) ?
+ '$wgStylePath/common/images/wiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' :
'display: none';
$this->addHTML(
@@ -933,6 +937,7 @@
'' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
+ 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox(
'config-logo-help' )
--
To view, visit https://gerrit.wikimedia.org/r/56917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6efdf931b0b6be755
[MediaWiki-commits] [Gerrit] Installer can now customize the logo in LocalSettings.php - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Installer can now customize the logo in LocalSettings.php
..
Installer can now customize the logo in LocalSettings.php
Bug: 40617
Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
---
M RELEASE-NOTES-1.21
M includes/installer/Installer.i18n.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerPage.php
4 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 295eb7b..94eade7 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -122,6 +122,7 @@
quotmarks, order and whitespace in the attribute list).
=== Bug fixes in 1.21 ===
+* (bug 40617) Installer can now customize the logo in LocalSettings.php
* (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
* (bug 40352) fixDoubleRedirects.php should support interwiki redirects.
* (bug 9237) SpecialBrokenRedirect should not list interwiki redirects.
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index ef055de..216ec57 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -455,6 +455,8 @@
'config-logo-help'=> "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
Upload an image of the appropriate size, and enter the URL here.
+You can use \$wgStylePath or \$wgScriptPath if your logo is relative to those
paths.
+
If you do not want a logo, leave this box blank.",
'config-instantcommons' => 'Enable Instant Commons',
'config-instantcommons-help' =>
'[//www.mediawiki.org/wiki/InstantCommons Instant Commons] is a feature that
allows wikis to use images, sounds and other media found on the
[//commons.wikimedia.org/ Wikimedia Commons] site.
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 7cb3779..72ea3db 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -62,12 +62,12 @@
'wgRightsText', 'wgMainCacheType',
'wgEnableUploads',
'wgMainCacheType', '_MemCachedServers',
'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons',
'wgUpgradeKey', 'wgDefaultSkin',
- 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength'
+ 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength', 'wgLogo',
),
$db->getGlobalNames()
);
- $unescaped = array( 'wgRightsIcon' );
+ $unescaped = array( 'wgRightsIcon', 'wgLogo' );
$boolItems = array(
'wgEnableEmail', 'wgEnableUserEmail',
'wgEnotifUserTalk',
'wgEnotifWatchlist', 'wgEmailAuthentication',
'wgEnableUploads', 'wgUseInstantCommons'
@@ -273,7 +273,7 @@
## The relative URL path to the logo. Make sure you change this from the
default,
## or else you'll overwrite your logo when you upgrade!
-\$wgLogo = \"\$wgStylePath/common/images/wiki.png\";
+\$wgLogo = \"{$this->values['wgLogo']}\";
## UPO means: this is also a user preference option
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index f352cf1..085456d 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -912,6 +912,10 @@
$this->getVar( 'wgDeletedDirectory' )
)
);
+ // If we're using the default, let the user set it relative to
$wgScriptPath
+ $curLogo = $this->getVar( 'wgLogo' );
+ $logoString = ( $curLogo ==
"/wiki/skins/common/images/wiki.png" ) ?
+ '$wgStylePath/common/images/wiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' :
'display: none';
$this->addHTML(
@@ -933,6 +937,7 @@
'' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
+ 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox(
'config-logo-help' )
--
To view, visit https://gerrit.wikimedia.org/r/56917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
Gerrit-PatchSet: 1
Gerrit-Proj
[MediaWiki-commits] [Gerrit] Installer can now customize the logo in LocalSettings.php - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56918
Change subject: Installer can now customize the logo in LocalSettings.php
..
Installer can now customize the logo in LocalSettings.php
Bug: 40617
Change-Id: Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
merge
Change-Id: I20cd6d531b0d446402ffebb0647d4b5dc05f
backport release notes Ia6efdf931b0b6be7556fc16c040aa7493845cdfc
Change-Id: I4e1ad1119ae7b6cea8e89aaebaabb8ee3aa034f6
---
M RELEASE-NOTES-1.21
M includes/installer/Installer.i18n.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerPage.php
4 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/56918/1
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 50fd734..3743549 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -130,6 +130,7 @@
by adding a new configuration variable $wgApplyIpBlocksToXff (disabled by
default).
=== Bug fixes in 1.21 ===
+* (bug [[40617]]) Installer can now customize the logo in LocalSettings.php
* (bug 40353) SpecialDoubleRedirect should support interwiki redirects.
* (bug 40352) fixDoubleRedirects.php should support interwiki redirects.
* (bug 9237) SpecialBrokenRedirect should not list interwiki redirects.
diff --git a/includes/installer/Installer.i18n.php
b/includes/installer/Installer.i18n.php
index 02f0c47..5e36a60 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -455,6 +455,8 @@
'config-logo-help'=> "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
Upload an image of the appropriate size, and enter the URL here.
+You can use \$wgStylePath or \$wgScriptPath if your logo is relative to those
paths.
+
If you do not want a logo, leave this box blank.",
'config-instantcommons' => 'Enable Instant Commons',
'config-instantcommons-help' =>
'[//www.mediawiki.org/wiki/InstantCommons Instant Commons] is a feature that
allows wikis to use images, sounds and other media found on the
[//commons.wikimedia.org/ Wikimedia Commons] site.
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index aa7fc97..cf45dcb 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -62,12 +62,12 @@
'wgRightsText', 'wgMainCacheType',
'wgEnableUploads',
'wgMainCacheType', '_MemCachedServers',
'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons',
'wgUpgradeKey', 'wgDefaultSkin',
- 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength'
+ 'wgMetaNamespace',
'wgResourceLoaderMaxQueryLength', 'wgLogo',
),
$db->getGlobalNames()
);
- $unescaped = array( 'wgRightsIcon' );
+ $unescaped = array( 'wgRightsIcon', 'wgLogo' );
$boolItems = array(
'wgEnableEmail', 'wgEnableUserEmail',
'wgEnotifUserTalk',
'wgEnotifWatchlist', 'wgEmailAuthentication',
'wgEnableUploads', 'wgUseInstantCommons'
@@ -273,7 +273,7 @@
## The relative URL path to the logo. Make sure you change this from the
default,
## or else you'll overwrite your logo when you upgrade!
-\$wgLogo = \"\$wgStylePath/common/images/wiki.png\";
+\$wgLogo = \"{$this->values['wgLogo']}\";
## UPO means: this is also a user preference option
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 305c012..593509e 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -933,6 +933,10 @@
$this->getVar( 'wgDeletedDirectory' )
)
);
+ // If we're using the default, let the user set it relative to
$wgScriptPath
+ $curLogo = $this->getVar( 'wgLogo' );
+ $logoString = ( $curLogo ==
"/wiki/skins/common/images/wiki.png" ) ?
+ '$wgStylePath/common/images/wiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' :
'display: none';
$this->addHTML(
@@ -954,6 +958,7 @@
'' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
+ 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelp
[MediaWiki-commits] [Gerrit] backport release notes from Ia6efdf931b0b6be7556fc16c040aa74... - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/56919 Change subject: backport release notes from Ia6efdf931b0b6be7556fc16c040aa7493845cdfc .. backport release notes from Ia6efdf931b0b6be7556fc16c040aa7493845cdfc Change-Id: I274a7429130db05c2dc8bba9bd32d28b933747d3 --- M RELEASE-NOTES-1.21 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/56919/1 diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 50fd734..3743549 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -130,6 +130,7 @@ by adding a new configuration variable $wgApplyIpBlocksToXff (disabled by default). === Bug fixes in 1.21 === +* (bug [[40617]]) Installer can now customize the logo in LocalSettings.php * (bug 40353) SpecialDoubleRedirect should support interwiki redirects. * (bug 40352) fixDoubleRedirects.php should support interwiki redirects. * (bug 9237) SpecialBrokenRedirect should not list interwiki redirects. -- To view, visit https://gerrit.wikimedia.org/r/56919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I274a7429130db05c2dc8bba9bd32d28b933747d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MarkAHershberger ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced indentation levels, broke long lines - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduced indentation levels, broke long lines
..
Reduced indentation levels, broke long lines
Also removed some unneeded else blocks to ensure more consistent return values.
Change-Id: Icf1d6fecfbd512fadad61442c968f0ef1ba30a88
---
M includes/specials/SpecialContributions.php
1 file changed, 211 insertions(+), 137 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 75983e8..e985811 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -28,7 +28,6 @@
*/
class SpecialContributions extends SpecialPage {
-
protected $opts;
public function __construct() {
@@ -89,11 +88,17 @@
if ( $this->opts['contribs'] != 'newbie' ) {
$target = $nt->getText();
$out->addSubtitle( $this->contributionsSub( $userObj )
);
- $out->setHTMLTitle( $this->msg( 'pagetitle',
$this->msg( 'contributions-title', $target )->plain() ) );
+ $out->setHTMLTitle( $this->msg(
+ 'pagetitle',
+ $this->msg( 'contributions-title', $target
)->plain()
+ ) );
$this->getSkin()->setRelevantUser( $userObj );
} else {
$out->addSubtitle( $this->msg(
'sp-contributions-newbies-sub' ) );
- $out->setHTMLTitle( $this->msg( 'pagetitle',
$this->msg( 'sp-contributions-newbies-title' )->plain() ) );
+ $out->setHTMLTitle( $this->msg(
+ 'pagetitle',
+ $this->msg( 'sp-contributions-newbies-title'
)->plain()
+ ) );
}
if ( ( $ns = $request->getVal( 'namespace', null ) ) !== null
&& $ns !== '' ) {
@@ -103,10 +108,8 @@
}
$this->opts['associated'] = $request->getBool( 'associated' );
-
- $this->opts['nsInvert'] = (bool) $request->getVal( 'nsInvert' );
-
- $this->opts['tagfilter'] = (string) $request->getVal(
'tagfilter' );
+ $this->opts['nsInvert'] = (bool)$request->getVal( 'nsInvert' );
+ $this->opts['tagfilter'] = (string)$request->getVal(
'tagfilter' );
// Allows reverts to have the bot flag in recent changes. It is
just here to
// be passed in the form at the top of the page
@@ -162,7 +165,6 @@
$this->addFeedLinks( array( 'action' => 'feedcontributions',
'user' => $target ) );
if ( wfRunHooks( 'SpecialContributionsBeforeMainOutput', array(
$id ) ) ) {
-
$out->addHTML( $this->getForm() );
$pager = new ContribsPager( $this->getContext(), array(
@@ -176,18 +178,20 @@
'nsInvert' => $this->opts['nsInvert'],
'associated' => $this->opts['associated'],
) );
+
if ( !$pager->getNumRows() ) {
$out->addWikiMsg( 'nocontribs', $target );
} else {
# Show a message about slave lag, if applicable
$lag = wfGetLB()->safeGetLag(
$pager->getDatabase() );
- if ( $lag > 0 )
+ if ( $lag > 0 ) {
$out->showLagWarning( $lag );
+ }
$out->addHTML(
'' . $pager->getNavigationBar() .
'' .
- $pager->getBody() .
- '' . $pager->getNavigationBar() .
''
+ $pager->getBody() .
+ '' .
$pager->getNavigationBar() . ''
);
}
$out->preventClickjacking(
$pager->getPreventClickjacking() );
@@ -195,16 +199,16 @@
# Show the appropriate "footer" message - WHOIS tools,
etc.
if ( $this->opts['contribs'] == 'newbie' ) {
$message = 'sp-contributions-footer-newbies';
- } elseif( IP::isIPAddress( $target ) ) {
+ } elseif ( IP::isIPAddress( $target ) ) {
$message = 'sp-contributions-footer-anon';
- } elseif( $userObj->isAnon() ) {
+ } elseif ( $userObj->isAnon() ) {
[MediaWiki-commits] [Gerrit] Add message - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56920
Change subject: Add message
..
Add message
Change-Id: Id2f9a589348be695efe8692c124b1c252b616264
---
M languages/SMW_Messages.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/20/56920/1
diff --git a/languages/SMW_Messages.php b/languages/SMW_Messages.php
index 939dcd7..4bfb6cc 100644
--- a/languages/SMW_Messages.php
+++ b/languages/SMW_Messages.php
@@ -188,6 +188,7 @@
'smw_propertylackspage' => 'All properties should be described by a
page!',
'smw_propertylackstype' => 'No type was specified for this property
(assuming type $1 for now).',
'smw_propertyhardlyused' => 'This property is hardly used within the
wiki!',
+ 'smw-property-name-invalid' => 'Property $1 can not be used (invalid
property name).',
// Messages for Unused Properties Special
'unusedproperties' => 'Unused properties',
@@ -465,6 +466,7 @@
'smw_concept_cache_miss' => 'This is an information message. Parameters:
* $1 holds the name of the [http://semantic-mediawiki.org/wiki/Help:Concepts
concept] (special precomputable query)',
'smw_noinvannot' => 'This is an information message.',
+ 'smw-property-name-invalid' => 'This is an information message.',
'version-semantic' => 'This is the name of the extension group on
[[Special:Version]].',
'smw_uri_blacklist' => '{{notranslate}}',
'smw_baduri' => 'This is an information message. Parameters:
--
To view, visit https://gerrit.wikimedia.org/r/56920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2f9a589348be695efe8692c124b1c252b616264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add message - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add message
..
Add message
Change-Id: Id2f9a589348be695efe8692c124b1c252b616264
---
M languages/SMW_Messages.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Mwjames: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/SMW_Messages.php b/languages/SMW_Messages.php
index 939dcd7..4bfb6cc 100644
--- a/languages/SMW_Messages.php
+++ b/languages/SMW_Messages.php
@@ -188,6 +188,7 @@
'smw_propertylackspage' => 'All properties should be described by a
page!',
'smw_propertylackstype' => 'No type was specified for this property
(assuming type $1 for now).',
'smw_propertyhardlyused' => 'This property is hardly used within the
wiki!',
+ 'smw-property-name-invalid' => 'Property $1 can not be used (invalid
property name).',
// Messages for Unused Properties Special
'unusedproperties' => 'Unused properties',
@@ -465,6 +466,7 @@
'smw_concept_cache_miss' => 'This is an information message. Parameters:
* $1 holds the name of the [http://semantic-mediawiki.org/wiki/Help:Concepts
concept] (special precomputable query)',
'smw_noinvannot' => 'This is an information message.',
+ 'smw-property-name-invalid' => 'This is an information message.',
'version-semantic' => 'This is the name of the extension group on
[[Special:Version]].',
'smw_uri_blacklist' => '{{notranslate}}',
'smw_baduri' => 'This is an information message. Parameters:
--
To view, visit https://gerrit.wikimedia.org/r/56920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2f9a589348be695efe8692c124b1c252b616264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames
Gerrit-Reviewer: Mwjames
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding define ganglia::view for abstracting ganglia web views. - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56921
Change subject: Adding define ganglia::view for abstracting ganglia web views.
..
Adding define ganglia::view for abstracting ganglia web views.
Adding udp2log view on ganglia.wikimedia.org
Change-Id: Ie3ab11316cf89e6ea1c6ec0edb2ea8a80947d9ab
---
M manifests/ganglia.pp
M manifests/misc/monitoring.pp
M manifests/site.pp
A templates/ganglia/ganglia_view.json.erb
4 files changed, 165 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/56921/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index cf82867..cb1a713 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -538,3 +538,89 @@
}
}
+
+# == Define ganlia::view
+# Defines a Ganglia view JSON file.
+# See
http://sourceforge.net/apps/trac/ganglia/wiki/ganglia-web-2#JSONdefinitionforviews
+# for documentation on Ganglia view JSON format.
+#
+# == Parameters:
+# $graphs - Shortcut for of describing items that represent
aggregate_graphs.
+# $items- Should match exactly the JSON structure expected by Ganglia
for views.
+# $view_type- If you are using aggregate_graphs, this must be set to
'standard'.
+# 'regex' will allow you to use non-aggregate graphs and match
hostnames by regex.
+# Default: 'standard'.
+# $default_size - Default size for graphs. Default: 'large'.
+# $conf_dir - Path to directory where ganglia view JSON files should live.
+# Defaults to the appropriate directory based on WMF $::realm.
Default: to /var/lib/ganglia/conf
+# $template - The ERb template to use for the JSON file. Only change this
if you need to do fancier things than this define allows.
+#
+# == Examples:
+# # A 'regex' (non aggregate graph) view:
+# # Note that no aggregate_graphs are used.
+# # This will add 4 graphs to the 'cpu' view.
+# # (i.e. cpu_user and cpu_system for each myhost and myhost1)
+# $host_regex = 'myhost[01]'
+# ganglia::view { 'cpu':
+# view_type => 'regex',
+# items => [
+# {
+# 'metric' => 'cpu_user',
+# 'hostname' => $host_regex,
+# }
+# {
+# 'metric' => 'cpu_system',
+# 'hostname' => $host_regex,
+# }
+# ],
+# }
+#
+#
+# # Use the $graphs parameter to describe aggregate graphs.
+# # You can describe the same graphs to add with $items.
+# # $graphs is just a shortcut. aggregate_graphs in $items
+# # are a bit overly verbose.
+# $host_regex = 'locke|emery|oxygen|gadolinium'
+# ganglia::view { 'udp2log':
+# graphs => [
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'packet_loss_average',
+# }
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'drops',
+# }
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'packet_loss_90th',
+# }
+# ],
+# }
+#
+define ganglia::view(
+ $graphs = [],
+ $items= [],
+ $view_type= 'standard',
+ $default_size = 'large',
+ $conf_dir = undef,
+ $template = 'ganglia/ganglia_view.json.erb')
+
+{
+ if ($conf_dir != undef) {
+ $confdir = $conf_dir
+ }
+ else {
+ $confdir = $::realm ? {
+ 'production' => '/srv/org/ganglia_storage/3.5.1/conf',
+ 'labs' => '/var/lib/ganglia/conf',
+ default => '/var/lib/ganglia/conf',
+ }
+ }
+
+ # require ganglia::web
+ $view_name = $name
+ file { "${confdir}/view_${name}.json":
+ content => template($template),
+ }
+}
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index d1ccbc8..722d758 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -40,4 +40,53 @@
source =>
"puppet:///files/ganglia/plugins/udp_stats.pyconf",
notify => Service[gmond];
}
+}
+
+# Ganglia views that should be
+# avaliable on ganglia.wikimedia.org
+class misc::monitoring::views {
+ require ganglia::web
+
+ misc::monitoring::view::udp2log { 'udp2log':
+ host_regex => 'locke|emery|oxygen|gadolinium',
+ }
+}
+
+# == Define misc:monitoring::view::udp2log
+# Installs a ganglia::view for a group of nodes
+# running udp2log. This is just a wrapper for
+# udp2log specific metrics to include in udp2log
+# ganglia views.
+#
+# == Parameters:
+# $host_regex - regex to pass to ganglia::view for matching host names in the
view.
+# $conf_dir
+#
+define misc::monitoring::view::udp2log($host_regex, $conf_dir = undef) {
+ ganglia::view { $name:
+ graphs => [
+ {
+ 'host_regex' => $host_regex,
+
[MediaWiki-commits] [Gerrit] Remove duplicate word - change (mediawiki...OpenID)
jenkins-bot has submitted this change and it was merged. Change subject: Remove duplicate word .. Remove duplicate word Spotted by 아라 and reported in https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Openid-identifier-page-text-different-user/en Change-Id: I02bcb68233d1f4abd84971d4e66aefe8c8fdebc9 --- M OpenID.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/OpenID.i18n.php b/OpenID.i18n.php index 0cec1a4..c94ac69 100644 --- a/OpenID.i18n.php +++ b/OpenID.i18n.php @@ -37,7 +37,7 @@ 'openidlogin' => 'Log in / create account with OpenID', 'openidserver' => 'OpenID server', 'openid-identifier-page-text-user' => 'This page is the identifier for user "$1".', - 'openid-identifier-page-text-different-user' => 'This page is the identifier for user User ID $1.', + 'openid-identifier-page-text-different-user' => 'This page is the identifier for user ID $1.', 'openid-identifier-page-text-no-such-local-openid' => 'This is an invalid local OpenID identifier.', 'openid-server-identity-page-text' => 'This is a technical OpenID server page for starting the OpenID authentication. The page has no other purpose.', 'openidxrds' => 'Yadis file', -- To view, visit https://gerrit.wikimedia.org/r/56910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02bcb68233d1f4abd84971d4e66aefe8c8fdebc9 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/OpenID Gerrit-Branch: master Gerrit-Owner: Siebrand Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Wikinaut Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduced indentation levels, broke long lines. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduced indentation levels, broke long lines.
..
Reduced indentation levels, broke long lines.
Reversed login a two cases to get there.
Also updated PHPDoc, removed an unneeded comment and removed superfluous
newlines.
Change-Id: Ica5f7d24171e2eaeccc0743f8800e18cf2de8006
---
M includes/specials/SpecialConfirmemail.php
1 file changed, 45 insertions(+), 36 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialConfirmemail.php
b/includes/specials/SpecialConfirmemail.php
index 0c98d37..3287c63 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -30,10 +30,6 @@
* @author Rob Church
*/
class EmailConfirmation extends UnlistedSpecialPage {
-
- /**
-* Constructor
-*/
public function __construct() {
parent::__construct( 'Confirmemail' );
}
@@ -41,16 +37,16 @@
/**
* Main execution point
*
-* @param $code Confirmation code passed to the page
+* @param null|string $code Confirmation code passed to the page
*/
function execute( $code ) {
$this->setHeaders();
$this->checkReadOnly();
- if( $code === null || $code === '' ) {
- if( $this->getUser()->isLoggedIn() ) {
- if( Sanitizer::validateEmail(
$this->getUser()->getEmail() ) ) {
+ if ( $code === null || $code === '' ) {
+ if ( $this->getUser()->isLoggedIn() ) {
+ if ( Sanitizer::validateEmail(
$this->getUser()->getEmail() ) ) {
$this->showRequestForm();
} else {
$this->getOutput()->addWikiMsg(
'confirmemail_noemail' );
@@ -62,7 +58,9 @@
array(),
array( 'returnto' =>
$this->getTitle()->getPrefixedText() )
);
- $this->getOutput()->addHTML( $this->msg(
'confirmemail_needlogin' )->rawParams( $llink )->parse() );
+ $this->getOutput()->addHTML(
+ $this->msg( 'confirmemail_needlogin'
)->rawParams( $llink )->parse()
+ );
}
} else {
$this->attemptConfirm( $code );
@@ -75,7 +73,10 @@
function showRequestForm() {
$user = $this->getUser();
$out = $this->getOutput();
- if( $this->getRequest()->wasPosted() && $user->matchEditToken(
$this->getRequest()->getText( 'token' ) ) ) {
+
+ if ( $this->getRequest()->wasPosted() &&
+ $user->matchEditToken( $this->getRequest()->getText(
'token' ) )
+ ) {
$status = $user->sendConfirmationMail();
if ( $status->isGood() ) {
$out->addWikiMsg( 'confirmemail_sent' );
@@ -83,7 +84,7 @@
$out->addWikiText( $status->getWikiText(
'confirmemail_sendfailed' ) );
}
} else {
- if( $user->isEmailConfirmed() ) {
+ if ( $user->isEmailConfirmed() ) {
// date and time are separate parameters to
facilitate localisation.
// $time is kept for backward compat reasons.
// 'emailauthenticated' is also used in
SpecialPreferences.php
@@ -94,11 +95,19 @@
$t = $lang->userTime( $emailAuthenticated,
$user );
$out->addWikiMsg( 'emailauthenticated', $time,
$d, $t );
}
- if( $user->isEmailConfirmationPending() ) {
- $out->wrapWikiMsg( "\n$1\n", 'confirmemail_pending' );
+
+ if ( $user->isEmailConfirmationPending() ) {
+ $out->wrapWikiMsg(
+ "\n$1\n",
+ 'confirmemail_pending'
+ );
}
+
$out->addWikiMsg( 'confirmemail_text' );
- $form = Xml::openElement( 'form', array( 'method' =>
'post', 'action' => $this->getTitle()->getLocalURL() ) );
+ $form = Xml::openElement(
+ 'form',
+ array( 'method' => 'post', 'action' =>
$this->getTitle()->getLocalURL() )
+ );
[MediaWiki-commits] [Gerrit] (bug 39503) Register preferences as 'api' type - change (mediawiki...TranslationNotifications)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56922
Change subject: (bug 39503) Register preferences as 'api' type
..
(bug 39503) Register preferences as 'api' type
The preferences weren't registered, so changing any other preferences
caused the translationnotifications-* preferences to be deleted.
This change prevents unwanted deletion of data and confusion
about the current preferences.
Change-Id: I5439a5f47b3bb05f4dab26139b0dc52d0ecd62c8
---
M TranslationNotifications.php
M TranslationNotificationsHooks.php
2 files changed, 21 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/22/56922/1
diff --git a/TranslationNotifications.php b/TranslationNotifications.php
index 16d7c7e..973bba7 100644
--- a/TranslationNotifications.php
+++ b/TranslationNotifications.php
@@ -69,6 +69,7 @@
$wgLogTypes[] = 'notifytranslators';
$wgLogActionsHandlers['notifytranslators/sent'] =
'TranslationNotificationsHooks::formatTranslationNotificationLogEntry';
+
$wgNotificationUsername = false;
$wgNotificationUserPassword = false;
@@ -80,3 +81,5 @@
foreach ( range( 1, 3 ) as $langNum ) {
$wgDefaultUserOptions["translationnotifications-lang-$langNum"] = '';
}
+
+$wgHooks['GetPreferences'][] =
'TranslationNotificationsHooks::onGetPreferences';
diff --git a/TranslationNotificationsHooks.php
b/TranslationNotificationsHooks.php
index 03a6579..cab2d60 100644
--- a/TranslationNotificationsHooks.php
+++ b/TranslationNotificationsHooks.php
@@ -68,4 +68,22 @@
$languageCount // $10
)->inLanguage( $language )->text();
}
+
+ public static function onGetPreferences( $user, &$preferences ) {
+ foreach ( array(
+ 'translationnotifications-lang-1',
+ 'translationnotifications-lang-2',
+ 'translationnotifications-lang-3',
+ 'translationnotifications-cmethod-email',
+ 'translationnotifications-cmethod-talkpage',
+
'translationnotifications-cmethod-talkpage-elsewhere-loc',
+ 'translationnotifications-freq',
+ ) as $preference ) {
+ $preferences[$preference] = array(
+ 'type' => 'api',
+ );
+ }
+
+ return true;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5439a5f47b3bb05f4dab26139b0dc52d0ecd62c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor QUnit test fixes - change (mediawiki...MobileFrontend)
JGonera has submitted this change and it was merged.
Change subject: Minor QUnit test fixes
..
Minor QUnit test fixes
Avoid using globals
Tell test how many to expect
Change-Id: Ied1cd5f0ae56951bfad37772a0a73dcd251b51b3
---
M tests/js/widgets/carousel.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/tests/js/widgets/carousel.js b/tests/js/widgets/carousel.js
index c812382..904b87e 100644
--- a/tests/js/widgets/carousel.js
+++ b/tests/js/widgets/carousel.js
@@ -2,9 +2,9 @@
var Carousel = M.require( 'widgets/carousel' );
- module( 'MobileFrontend Carousel' );
+ QUnit.module( 'MobileFrontend Carousel' );
- test( '#next', function() {
+ QUnit.test( '#next', 5, function() {
var c = new Carousel();
strictEqual( c.totalPages, 3, 'There are 3 pages in the
carousel' );
strictEqual( c.page, 0, 'Initialises to page 0' );
@@ -16,7 +16,7 @@
strictEqual( c.page, 2, 'Still page 2 (no more pages)' );
} );
- test( '#prev', function() {
+ QUnit.test( '#prev', 4, function() {
var c = new Carousel();
strictEqual( c.page, 0, 'Initialises to page 0' );
c.previous();
@@ -27,7 +27,7 @@
strictEqual( c.page, 0, 'Back on page 0' );
} );
- test( '#showCurrentPage', function() {
+ QUnit.test( '#showCurrentPage', 3, function() {
var c = new Carousel();
strictEqual( c.page, 0, 'Initialises to page 0' );
c.next();
--
To view, visit https://gerrit.wikimedia.org/r/56625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied1cd5f0ae56951bfad37772a0a73dcd251b51b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56923
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/56923/1
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 909bd49..8729426 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
Reedy has submitted this change and it was merged.
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 909bd49..8729426 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PHPDoc - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56924
Change subject: Fix PHPDoc
..
Fix PHPDoc
Was incorrectly documenting Article instead of Page. Also changed $article
to $page to avoid confusion.
Change-Id: I366769a201b5fda1c8d59119bdac908fd7727cbf
---
M includes/actions/CreditsAction.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/56924/1
diff --git a/includes/actions/CreditsAction.php
b/includes/actions/CreditsAction.php
index 4d3c41b..895f3d3 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -79,17 +79,17 @@
/**
* Get the last author with the last modification time
-* @param $article Article object
+* @param Page $page
* @return String HTML
*/
- protected function getAuthor( Page $article ) {
- $user = User::newFromName( $article->getUserText(), false );
+ protected function getAuthor( Page $page ) {
+ $user = User::newFromName( $page->getUserText(), false );
- $timestamp = $article->getTimestamp();
+ $timestamp = $page->getTimestamp();
if ( $timestamp ) {
$lang = $this->getLanguage();
- $d = $lang->date( $article->getTimestamp(), true );
- $t = $lang->time( $article->getTimestamp(), true );
+ $d = $lang->date( $page->getTimestamp(), true );
+ $t = $lang->time( $page->getTimestamp(), true );
} else {
$d = '';
$t = '';
--
To view, visit https://gerrit.wikimedia.org/r/56924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I366769a201b5fda1c8d59119bdac908fd7727cbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding define ganglia::view for abstracting ganglia web views. - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Adding define ganglia::view for abstracting ganglia web views.
..
Adding define ganglia::view for abstracting ganglia web views.
Adding udp2log view on ganglia.wikimedia.org
Change-Id: Ie3ab11316cf89e6ea1c6ec0edb2ea8a80947d9ab
---
M manifests/ganglia.pp
M manifests/misc/monitoring.pp
M manifests/site.pp
A templates/ganglia/ganglia_view.json.erb
4 files changed, 158 insertions(+), 1 deletion(-)
Approvals:
Ryan Lane: Looks good to me, approved
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index cf82867..a7110e5 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -412,6 +412,7 @@
$ganglia_servername = "ganglia.wmflabs.org"
$ganglia_serveralias = "aggregator1.pmtpa.wmflabs"
$ganglia_webdir = "/usr/share/ganglia-webfrontend"
+ $ganglia_confdir = "/var/lib/ganglia/conf"
require ganglia::aggregator
@@ -421,6 +422,9 @@
# TODO(ssmollett): when switching to ganglia-webfrontend
# package, use /usr/share/ganglia-webfrontend
$ganglia_webdir =
"/srv/org/wikimedia/ganglia-web-3.5.4+security"
+ # Why is this set to a different directory than
$ganglia_webdir???
+ $ganglia_confdir = "/srv/org/ganglia_storage/3.5.1/conf"
+
$ganglia_ssl_cert = "/etc/ssl/certs/star.wikimedia.org.pem"
$ganglia_ssl_key = "/etc/ssl/private/star.wikimedia.org.key"
}
@@ -538,3 +542,79 @@
}
}
+
+# == Define ganlia::view
+# Defines a Ganglia view JSON file.
+# See
http://sourceforge.net/apps/trac/ganglia/wiki/ganglia-web-2#JSONdefinitionforviews
+# for documentation on Ganglia view JSON format.
+#
+# == Parameters:
+# $graphs - Shortcut for of describing items that represent
aggregate_graphs.
+# $items- Should match exactly the JSON structure expected by Ganglia
for views.
+# $view_type- If you are using aggregate_graphs, this must be set to
'standard'.
+# 'regex' will allow you to use non-aggregate graphs and match
hostnames by regex.
+# Default: 'standard'.
+# $default_size - Default size for graphs. Default: 'large'.
+# $conf_dir - Path to directory where ganglia view JSON files should live.
+# Defaults to the appropriate directory based on WMF $::realm.
Default: to /var/lib/ganglia/conf
+# $template - The ERb template to use for the JSON file. Only change this
if you need to do fancier things than this define allows.
+#
+# == Examples:
+# # A 'regex' (non aggregate graph) view:
+# # Note that no aggregate_graphs are used.
+# # This will add 4 graphs to the 'cpu' view.
+# # (i.e. cpu_user and cpu_system for each myhost and myhost1)
+# $host_regex = 'myhost[01]'
+# ganglia::view { 'cpu':
+# view_type => 'regex',
+# items => [
+# {
+# 'metric' => 'cpu_user',
+# 'hostname' => $host_regex,
+# }
+# {
+# 'metric' => 'cpu_system',
+# 'hostname' => $host_regex,
+# }
+# ],
+# }
+#
+#
+# # Use the $graphs parameter to describe aggregate graphs.
+# # You can describe the same graphs to add with $items.
+# # $graphs is just a shortcut. aggregate_graphs in $items
+# # are a bit overly verbose.
+# $host_regex = 'locke|emery|oxygen|gadolinium'
+# ganglia::view { 'udp2log':
+# graphs => [
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'packet_loss_average',
+# }
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'drops',
+# }
+# {
+# 'host_regex' => $host_regex,
+# 'metric_regex' => 'packet_loss_90th',
+# }
+# ],
+# }
+#
+define ganglia::view(
+ $graphs = [],
+ $items= [],
+ $view_type= 'standard',
+ $default_size = 'large',
+ $conf_dir = $ganglia::web::ganglia_confdir,
+ $template = 'ganglia/ganglia_view.json.erb')
+{
+ require ganglia::web
+
+ # require ganglia::web
+ $view_name = $name
+ file { "${conf_dir}/view_${name}.json":
+ content => template($template),
+ }
+}
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index d1ccbc8..4f8b9f1 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -40,4 +40,52 @@
source =>
"puppet:///files/ganglia/plugins/udp_stats.pyconf",
notify => Service[gmond];
}
+}
+
+# Ganglia views that should be
+# avaliable on ganglia.wikimedia.org
+class misc::monitoring::views {
+ require ganglia::web
+
+ misc::monitoring::view::udp2log { 'udp2log':
+ host_regex => 'locke|emery|oxygen|gadolinium',
+ }
+}
+
+# == Define misc:moni
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56925
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/56925/1
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 909bd49..8729426 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf1
Gerrit-Owner: Reedy
Gerrit-Reviewer: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PHPDoc - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56926
Change subject: Fix PHPDoc
..
Fix PHPDoc
"The" is an unknown class.
Change-Id: Ic8ce1f1252f4b435dbca789226056781d606d8ee
---
M includes/actions/InfoAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/56926/1
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index ac9107f..55fa108 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -126,7 +126,7 @@
/**
* Creates a header that can be added to the output.
*
-* @param $header The header text.
+* @param string $header The header text.
* @return string The HTML.
*/
protected function makeHeader( $header ) {
--
To view, visit https://gerrit.wikimedia.org/r/56926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8ce1f1252f4b435dbca789226056781d606d8ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
Reedy has submitted this change and it was merged.
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 909bd49..8729426 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf1
Gerrit-Owner: Reedy
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensuring ruby-json is installed on puppetmasters - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56927
Change subject: Ensuring ruby-json is installed on puppetmasters
..
Ensuring ruby-json is installed on puppetmasters
Change-Id: Iaccfdf1749c1bc92af2c0d8c15345077cdd0cfe6
---
M manifests/puppetmaster.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/56927/1
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index d02a151..1d217e3 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -27,7 +27,7 @@
# Require /etc/puppet.conf to be in place, so the postinst scripts do
the right things.
require config
- package { [ "puppetmaster", "puppetmaster-common", "vim-puppet",
"puppet-el", "rails", "libmysql-ruby" ]:
+ package { [ "puppetmaster", "puppetmaster-common", "vim-puppet",
"puppet-el", "rails", "libmysql-ruby", "ruby-json" ]:
ensure => latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/56927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaccfdf1749c1bc92af2c0d8c15345077cdd0cfe6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56928
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/28/56928/1
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index f2e61a5..245a5bd 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: Reedy
Gerrit-Reviewer: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensuring ruby-json is installed on puppetmasters - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Ensuring ruby-json is installed on puppetmasters
..
Ensuring ruby-json is installed on puppetmasters
Change-Id: Iaccfdf1749c1bc92af2c0d8c15345077cdd0cfe6
---
M manifests/puppetmaster.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index d02a151..1d217e3 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -27,7 +27,7 @@
# Require /etc/puppet.conf to be in place, so the postinst scripts do
the right things.
require config
- package { [ "puppetmaster", "puppetmaster-common", "vim-puppet",
"puppet-el", "rails", "libmysql-ruby" ]:
+ package { [ "puppetmaster", "puppetmaster-common", "vim-puppet",
"puppet-el", "rails", "libmysql-ruby", "ruby-json" ]:
ensure => latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/56927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaccfdf1749c1bc92af2c0d8c15345077cdd0cfe6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add docs for constructor - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56929
Change subject: Add docs for constructor
..
Add docs for constructor
Change-Id: I976dc8fc8a3736aaa7964cedb8e9470eacf5fda0
---
M includes/actions/RawAction.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/56929/1
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index f8209e6..23db874 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -251,6 +251,10 @@
class RawPage extends RawAction {
public $mOldId;
+ /**
+* @param Page $page
+* @param WebRequest|bool $request The WebRequest (default: false).
+*/
function __construct( Page $page, $request = false ) {
wfDeprecated( __CLASS__, '1.19' );
parent::__construct( $page );
--
To view, visit https://gerrit.wikimedia.org/r/56929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I976dc8fc8a3736aaa7964cedb8e9470eacf5fda0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mention SASS and basic instructions in README. - change (mediawiki...Agora)
jenkins-bot has submitted this change and it was merged. Change subject: Mention SASS and basic instructions in README. .. Mention SASS and basic instructions in README. Change-Id: Ibfe5e80cc2650b82101cb8b45f49b4d3a4eb51f6 --- M README 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/README b/README index 831f3cb..467a2c5 100644 --- a/README +++ b/README @@ -1,5 +1,15 @@ # Agora extension adds new styles to MediaWiki +# It is implemented in SASS and Compass. To convert the SASS to CSS, you will need to: + +Install compass. On Debian/Ubuntu, this is: + +sudo apt-get install ruby-compass + +Then, to build, run: + +make + # To enable Agora on specific pages, please add them to the $wgAgoraEnabledPages array. # To enable Agora on specific actions, please add them to the $wgAgoraEnabledActions array. # Enable Agora site-wide with $wgAgoraEnabledSiteWide = true; -- To view, visit https://gerrit.wikimedia.org/r/56707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfe5e80cc2650b82101cb8b45f49b4d3a4eb51f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Agora Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: Massaf Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PHPDoc - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix PHPDoc
..
Fix PHPDoc
Was incorrectly documenting Article instead of Page. Also changed $article
to $page to avoid confusion.
Change-Id: I366769a201b5fda1c8d59119bdac908fd7727cbf
---
M includes/actions/CreditsAction.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/CreditsAction.php
b/includes/actions/CreditsAction.php
index 4d3c41b..895f3d3 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -79,17 +79,17 @@
/**
* Get the last author with the last modification time
-* @param $article Article object
+* @param Page $page
* @return String HTML
*/
- protected function getAuthor( Page $article ) {
- $user = User::newFromName( $article->getUserText(), false );
+ protected function getAuthor( Page $page ) {
+ $user = User::newFromName( $page->getUserText(), false );
- $timestamp = $article->getTimestamp();
+ $timestamp = $page->getTimestamp();
if ( $timestamp ) {
$lang = $this->getLanguage();
- $d = $lang->date( $article->getTimestamp(), true );
- $t = $lang->time( $article->getTimestamp(), true );
+ $d = $lang->date( $page->getTimestamp(), true );
+ $t = $lang->time( $page->getTimestamp(), true );
} else {
$d = '';
$t = '';
--
To view, visit https://gerrit.wikimedia.org/r/56924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I366769a201b5fda1c8d59119bdac908fd7727cbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused local variables - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56930
Change subject: Remove unused local variables
..
Remove unused local variables
Marked one as FIXME, because I'm not certain if there's maybe some magic
depending on it. Should be removed by someone more familiar with this
code, or a comment should be added on why it must be kept.
Change-Id: I8eb774c2857dcc87404fd8a7e5fb66c5a4c9643e
---
M includes/api/ApiCreateAccount.php
M includes/api/ApiImageRotate.php
M includes/api/ApiQuery.php
3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/56930/1
diff --git a/includes/api/ApiCreateAccount.php
b/includes/api/ApiCreateAccount.php
index 55c60cc..a521346 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -43,8 +43,6 @@
$params = $this->extractRequestParams();
- $result = array();
-
// Init session if necessary
if ( session_id() == '' ) {
wfSetupSession();
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index ebdbedd..5aa41ea 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -53,16 +53,13 @@
}
}
-
public function execute() {
$params = $this->extractRequestParams();
$rotation = $params['rotation'];
- $user = $this->getUser();
$pageSet = $this->getPageSet();
$pageSet->execute();
- $result = array();
$result = array();
self::addValues( $result, $pageSet->getInvalidTitles(),
'invalid', 'title' );
@@ -181,7 +178,6 @@
}
public function getAllowedParams( $flags = 0 ) {
- $pageSet = $this->getPageSet();
$result = array(
'rotation' => array(
ApiBase::PARAM_TYPE => array( '90', '180',
'270' ),
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 7c64996..2c497ef 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -382,6 +382,7 @@
$modules = $allModules;
$tmp = $completeModules;
$wasPosted = $this->getRequest()->wasPosted();
+ // @todo FIXME: Unused local variable?
$main = $this->getMain();
/** @var $module ApiQueryBase */
--
To view, visit https://gerrit.wikimedia.org/r/56930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb774c2857dcc87404fd8a7e5fb66c5a4c9643e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix PHPDoc - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix PHPDoc
..
Fix PHPDoc
"The" is an unknown class.
Change-Id: Ic8ce1f1252f4b435dbca789226056781d606d8ee
---
M includes/actions/InfoAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index ac9107f..55fa108 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -126,7 +126,7 @@
/**
* Creates a header that can be added to the output.
*
-* @param $header The header text.
+* @param string $header The header text.
* @return string The HTML.
*/
protected function makeHeader( $header ) {
--
To view, visit https://gerrit.wikimedia.org/r/56926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8ce1f1252f4b435dbca789226056781d606d8ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding rdb1/2 dhcpd - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56931
Change subject: Adding rdb1/2 dhcpd
..
Adding rdb1/2 dhcpd
Change-Id: Ieadeb827831381f6aacca0058f154f0e6a333fd7
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/decommissioning.pp
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/56931/1
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 0563746..584f43a 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3586,6 +3586,16 @@
fixed-address promethium.eqiad.wmnet;
}
+host rdb1 {
+ hardware ethernet90:B1:1C:36:A1:99;
+ fixed-address rdb1.pmtpa.wmnet;
+}
+
+host rdb2 {
+ hardware ethernet 90:B1:1C:36:A2:99;
+ fixed-address rdb2.pmtpa.wmnet;
+}
+
host rdb1001 {
hardware ethernet 90:B1:1C:2D:7B:74;
fixed-address rdb1001.eqiad.wmnet;
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index eaa6cc0..85eb327 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -18,6 +18,7 @@
"db5",
"db7",
"db8",
+"db11",
"db12",
"db13",
"db14",
--
To view, visit https://gerrit.wikimedia.org/r/56931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieadeb827831381f6aacca0058f154f0e6a333fd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add PHPStorm specific comments to ignore case fall through - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56932
Change subject: Add PHPStorm specific comments to ignore case fall through
..
Add PHPStorm specific comments to ignore case fall through
Change-Id: I751dd68da6d38c003a32a8ce23530fc3d8074df1
---
M includes/api/ApiEditPage.php
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/56932/1
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 4916145..e5fbab2 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -344,59 +344,75 @@
switch( $status->value ) {
case EditPage::AS_HOOK_ERROR:
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_HOOK_ERROR_EXPECTED:
$this->dieUsageMsg( 'hookaborted' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_PARSE_ERROR:
$this->dieUsage( $status->getMessage(),
'parseerror' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_IMAGE_REDIRECT_ANON:
$this->dieUsageMsg( 'noimageredirect-anon' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_IMAGE_REDIRECT_LOGGED:
$this->dieUsageMsg( 'noimageredirect-logged' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_SPAM_ERROR:
$this->dieUsageMsg( array( 'spamdetected',
$result['spam'] ) );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_BLOCKED_PAGE_FOR_USER:
$this->dieUsageMsg( 'blockedtext' );
case EditPage::AS_MAX_ARTICLE_SIZE_EXCEEDED:
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_CONTENT_TOO_BIG:
$this->dieUsageMsg( array( 'contenttoobig',
$wgMaxArticleSize ) );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_READ_ONLY_PAGE_ANON:
$this->dieUsageMsg( 'noedit-anon' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_READ_ONLY_PAGE_LOGGED:
$this->dieUsageMsg( 'noedit' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_READ_ONLY_PAGE:
$this->dieReadOnly();
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_RATE_LIMITED:
$this->dieUsageMsg( 'actionthrottledtext' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_ARTICLE_WAS_DELETED:
$this->dieUsageMsg( 'wasdeleted' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_NO_CREATE_PERMISSION:
$this->dieUsageMsg( 'nocreate-loggedin' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_BLANK_ARTICLE:
$this->dieUsageMsg( 'blankpage' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_CONFLICT_DETECTED:
$this->dieUsageMsg( 'editconflict' );
// case EditPage::AS_SUMMARY_NEEDED: Can't happen since
we set wpIgnoreBlankSummary
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_TEXTBOX_EMPTY:
$this->dieUsageMsg( 'emptynewsection' );
+ /** @noinspection PhpMissingBreakStatementInspection */
case EditPage::AS_SUCCESS_NEW_ARTICLE:
$r['new'] = '';
- // fall-through
case EditPage::AS_SUCCESS_UPDATE:
$r['result'] = 'Success';
@@ -414,6 +430,7 @@
}
break;
+ /** @noinspection PhpMissingBreakStatementInspection
[MediaWiki-commits] [Gerrit] Adding rdb1/2 dhcpd - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding rdb1/2 dhcpd
..
Adding rdb1/2 dhcpd
Change-Id: Ieadeb827831381f6aacca0058f154f0e6a333fd7
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/decommissioning.pp
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Cmjohnson: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 0563746..584f43a 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3586,6 +3586,16 @@
fixed-address promethium.eqiad.wmnet;
}
+host rdb1 {
+ hardware ethernet90:B1:1C:36:A1:99;
+ fixed-address rdb1.pmtpa.wmnet;
+}
+
+host rdb2 {
+ hardware ethernet 90:B1:1C:36:A2:99;
+ fixed-address rdb2.pmtpa.wmnet;
+}
+
host rdb1001 {
hardware ethernet 90:B1:1C:2D:7B:74;
fixed-address rdb1001.eqiad.wmnet;
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index eaa6cc0..85eb327 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -18,6 +18,7 @@
"db5",
"db7",
"db8",
+"db11",
"db12",
"db13",
"db14",
--
To view, visit https://gerrit.wikimedia.org/r/56931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieadeb827831381f6aacca0058f154f0e6a333fd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson
Gerrit-Reviewer: Cmjohnson
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update PHPDoc comments - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56933
Change subject: Update PHPDoc comments
..
Update PHPDoc comments
Change-Id: Id20f632762d705ba5e5eb18088f6e9e551b3f42b
---
M includes/api/ApiImageRotate.php
M includes/api/ApiPageSet.php
M includes/api/ApiQueryCategories.php
M includes/api/ApiQueryDuplicateFiles.php
M includes/api/ApiQueryImageInfo.php
5 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/56933/1
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index 5aa41ea..e35b788 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -152,6 +152,7 @@
/**
* Checks that the user has permissions to perform rotations.
* @param $user User The user to check.
+* @param Title $title
* @return string|null Permission error message, or null if there is no
error
*/
protected function checkPermissions( $user, $title ) {
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index c76e22b..0645edb 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -69,6 +69,9 @@
private $mFakePageId = -1;
private $mCacheMode = 'public';
private $mRequestedPageFields = array();
+ /**
+* @var int
+*/
private $mDefaultNamespace = NS_MAIN;
/**
diff --git a/includes/api/ApiQueryCategories.php
b/includes/api/ApiQueryCategories.php
index 69a6441..93ae61a 100644
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -49,7 +49,6 @@
/**
* @param $resultPageSet ApiPageSet
-* @return
*/
private function run( $resultPageSet = null ) {
if ( $this->getPageSet()->getGoodTitleCount() == 0 ) {
diff --git a/includes/api/ApiQueryDuplicateFiles.php
b/includes/api/ApiQueryDuplicateFiles.php
index 18dcba8..7f73631 100644
--- a/includes/api/ApiQueryDuplicateFiles.php
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -48,8 +48,7 @@
}
/**
-* @param $resultPageSet ApiPageSet
-* @return
+* @param ApiPageSet $resultPageSet
*/
private function run( $resultPageSet = null ) {
$params = $this->extractRequestParams();
diff --git a/includes/api/ApiQueryImageInfo.php
b/includes/api/ApiQueryImageInfo.php
index 556f147..b2ef048 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -547,7 +547,7 @@
* Returns the descriptions for the properties provided by
getPropertyNames()
*
* @param array $filter List of properties to filter out
-*
+* @param string $modulePrefix
* @return array
*/
public static function getPropertyDescriptions( $filter = array(),
$modulePrefix = '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/56933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id20f632762d705ba5e5eb18088f6e9e551b3f42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unneeded else{} and return - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56934
Change subject: Remove unneeded else{} and return
..
Remove unneeded else{} and return
Else action was default. Returned the result of a void function.
Change-Id: I9ddf051ded0228dd3dfdfe9312f467d9c57f1716
---
M includes/api/ApiUpload.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/56934/1
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 2dcf392..719032f 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -444,9 +444,9 @@
$verification = $this->mUpload->verifyUpload();
if ( $verification['status'] === UploadBase::OK ) {
return;
- } else {
- return $this->checkVerification( $verification );
}
+
+ $this->checkVerification( $verification );
}
/**
@@ -455,7 +455,7 @@
protected function checkVerification( array $verification ) {
global $wgFileExtensions;
- // TODO: Move them to ApiBase's message map
+ // @todo Move them to ApiBase's message map
switch( $verification['status'] ) {
// Recoverable errors
case UploadBase::MIN_LENGTH_PARTNAME:
--
To view, visit https://gerrit.wikimedia.org/r/56934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ddf051ded0228dd3dfdfe9312f467d9c57f1716
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed move bug that caused test failures. - change (mediawiki...SwiftCloudFiles)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56935
Change subject: Fixed move bug that caused test failures.
..
Fixed move bug that caused test failures.
Change-Id: Iad368435a7aff88f78aee72133130da307a9e2be
---
M php-cloudfiles-wmf/cloudfiles.php
1 file changed, 25 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SwiftCloudFiles
refs/changes/35/56935/1
diff --git a/php-cloudfiles-wmf/cloudfiles.php
b/php-cloudfiles-wmf/cloudfiles.php
index afb276a..f2f92aa 100644
--- a/php-cloudfiles-wmf/cloudfiles.php
+++ b/php-cloudfiles-wmf/cloudfiles.php
@@ -959,6 +959,14 @@
}
/**
+* @param $cont CF_Container|string
+* @return bool Whether this is the same container as the given one
+*/
+ public function equals( $cont ) {
+ return ( $this->name === self::get_container_name( $cont ) );
+ }
+
+ /**
* Enable Container content to be served via CDN or modify CDN
attributes
*
* Either enable this Container's content to be served via CDN or
@@ -1573,9 +1581,15 @@
public function move_object_to(
$obj, $container_target, $dest_obj_name = NULL, $metadata =
NULL, $headers = NULL
) {
+ $src_obj_name = self::get_object_name( $obj );
+ $dest_obj_name = isset( $dest_obj_name ) ? $dest_obj_name :
$src_obj_name;
$retVal = $this->copy_object_to(
$obj, $container_target, $dest_obj_name, $metadata,
$headers );
- return $retVal ? $this->delete_object( $obj, $this->name ) :
False;
+ if ( $this->equals( $container_target ) && $src_obj_name ===
$dest_obj_name ) {
+ return $retVal; // nothing to delete
+ } else {
+ return $retVal ? $this->delete_object( $obj,
$this->name ) : False;
+ }
}
/**
@@ -1585,9 +1599,16 @@
public function move_object_to_async(
$obj, $container_target, $dest_obj_name = NULL, $metadata =
NULL, $headers = NULL
) {
- return $this->copy_object_to_async(
- $obj, $container_target, $dest_obj_name, $metadata,
$headers
- )->combine( $this->delete_object_async( $obj, $this->name ) );
+ $src_obj_name = self::get_object_name( $obj );
+ $dest_obj_name = isset( $dest_obj_name ) ? $dest_obj_name :
$src_obj_name;
+ if ( $this->equals( $container_target ) && $src_obj_name ===
$dest_obj_name ) {
+ return $this->copy_object_to_async(
+ $obj, $container_target, $dest_obj_name,
$metadata, $headers );
+ } else {
+ return $this->copy_object_to_async(
+ $obj, $container_target, $dest_obj_name,
$metadata, $headers
+ )->combine( $this->delete_object_async( $obj,
$this->name ) );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/56935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad368435a7aff88f78aee72133130da307a9e2be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SwiftCloudFiles
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setting absent to a public id for chris johnson - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56936
Change subject: Setting absent to a public id for chris johnson
..
Setting absent to a public id for chris johnson
Change-Id: I9040db9888d33248066f3472cac244fbf1a0863a
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/56936/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 5c4b798..491f74e 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -332,7 +332,7 @@
}
ssh_authorized_key {
"chrisj@chrisj-VPCEB23FM":
- ensure => present,
+ ensure => absent,
user=> $username,
type=> "ssh-rsa",
key =>
"B3NzaC1yc2EDAQABAAABAQDP7wD7CRHLh4V9Sjn72a/eh3hTQhprQ3fPxUX+G7oCGuRXmWAwHcoB2Rm7vZxiAEa6hA151YOEorYN8e6bYP0eqcpEu9G9cbDirnaAhKHf+r+n9OgJmpA8hDQQ0H4MuWH9W6uQLEi1Xl9Z41/u/LlfrmD9F77ed2jXCYAYgVwuNuO5lnOevMxLWH+aCtfYdp/QtEA9a+o2j0Dc0JveqXNFlCdcacLAME2q7ZHnyRwFndMgTiljnOSb3SjV/1tkNtq3Dkhnp1T3LXgSIX7gtxbfVd2u5b8HoaQYmpXSlRhyL+ulVJDJAEFVA+tp5lbcGK4kglNnBNKrQO9Bng+FlKwR";
--
To view, visit https://gerrit.wikimedia.org/r/56936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9040db9888d33248066f3472cac244fbf1a0863a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] really basic module for multiple instance of mysql on a node - change (operations/puppet)
Pyoungmeister has submitted this change and it was merged.
Change subject: really basic module for multiple instance of mysql on a node
..
really basic module for multiple instance of mysql on a node
needs some more work, monitoring, white space, etc
Change-Id: Idc956372f31906e72a582a377c5ff90ade595248
---
M manifests/role/db.pp
M manifests/site.pp
A modules/mysql_multi_instance/manifests/config.pp
A modules/mysql_multi_instance/manifests/init.pp
A modules/mysql_multi_instance/manifests/instance.pp
A modules/mysql_multi_instance/manifests/params.pp
A modules/mysql_multi_instance/templates/my.conf.cnf.erb
A modules/mysql_multi_instance/templates/mysql.init.erb
8 files changed, 887 insertions(+), 106 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 500e156..7e7b71c 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -12,124 +12,39 @@
}
-class role::db::sanitarium {
- class base {
+class role::db::sanitarium( $instances = {} ) {
+ ## $instances must be a 2-level hash of the form:
+ ## 'shard9001' => { port => NUMBER, innodb_log_file_size => "CORRECT_M", ram
=> "HELLA_G" },
+ ## 'shard9002' => { port => NUMBER+1, innodb_log_file_size => "CORRECT_M",
ram => "HELLA_G" },
$cluster = "mysql"
system_role {"role::db::sanitarium": description => "pre-labsdb dbs for
Data Sanitization" }
include standard,
-mysql::params
+mysql_multi_instance
class { mysql :
package_name => 'mariadb-client-5.5'
}
-systemuser {
- "mysql": name => "mysql", shell => "/bin/sh", home => "/home/mysql"
-}
-file {
- "/a/tmp/":
-owner => mysql,
-group => mysql,
-mode => 0755,
-ensure => directory,
-require => User["mysql"];
-}
- }
+ ## some per-node monitoring here
- define instance(
-$port
-){
-
-$serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
-$ram = inline_template("<%= ram = memorysize.split[0]; ram =
Float(ram) * 0.75; ram = ram.round; ram = String(ram); ram %>G")
-
-include role::db::sanitarium::base
-
-class { mysql::server :
- package_name => 'mariadb-server-5.5',
- config_hash => {
-port => $port,
-config_file => "/etc/my.cnf.$port",
-socket=> "/tmp/mysql.$port.sock",
-pidfile => "/a/sqldata.$port/mysql.pid",
-datadir => "/a/sqldata.$port/",
-multi_instance=> true,
- }
-}
-
-file {
- "/a/sqldata.${port}/":
-owner => mysql,
-group => mysql,
-mode => 0755,
-ensure => directory,
-require => User["mysql"];
- "/etc/init.d/mysql-${port}":
-owner => root,
-group => root,
-mode => 0555,
-content => template('mysql/mysql.init.erb');
-}
-
-mysql::server::config {"my.cnf.${port}" :
- settings => {
-'mysqld' => {
- 'server_id' => $serverid,
- 'read_only' => 1,
- 'innodb_file_per_table' => true,
- 'query_cache_type' => 0,
- 'log_slow_verbosity' => 'Query_plan',
- 'optimizer_switch' => 'extended_keys=on',
- 'innodb-adaptive-flushing' => 1,
- 'innodb-buffer-pool-size' => $ram,
- 'innodb-flush-method' => 'O_DIRECT',
- 'innodb-io-capacity' => 1000,
- 'innodb-log-file-size' => "500M",
- 'innodb-old-blocks-pct' => 80,
- 'innodb-old-blocks-time' => 1000,
- 'innodb-read-io-threads' => 16,
- 'innodb-thread-concurrency' => 0,
- 'innodb-use-sys-malloc' => true,
- 'innodb-write-io-threads' => 8,
- 'innodb-checksums' =>1,
- 'max_connections' => 5000,
- 'table_open_cache' => 5,
- 'table_definition_cache' => 4,
- 'query_cache_size'=> 0,
- 'log_slow_queries' => true,
- 'long_query_time' => 0.45,
- 'log_bin' => true,
- 'log_slave_updates' => true,
- 'sync_binlog' => 1,
- 'binlog_cache_size' => "1M",
- 'max_binlog_size' => "1000M",
- 'binlog_format'=> "statement",
- 'expire_logs_days' => 30,
- 'connect_timeout'=>3,
- 'back_log'=>1000,
- 'max_connect_errors'=>10,
- 'temp-pool' => true,
-}
- }
-}
-
+ ## for key in instances, make a mysql instance. need port,
innodb_log_file_size, and amount of ram
+ $instances_keys = keys($instances)
+ mysql_multi_instance::instance { $instances_keys :
+port => $role::db::sanitarium::instances[$title]['port'],
+innodb_log_file_size =>
$role::db::sanitarium::instances[$title]['innodb_log_file
[MediaWiki-commits] [Gerrit] Register preferences as 'api' type - change (mediawiki...TranslationNotifications)
jenkins-bot has submitted this change and it was merged.
Change subject: Register preferences as 'api' type
..
Register preferences as 'api' type
The preferences weren't registered, so changing any other preferences
caused the translationnotifications-* preferences to be deleted.
This change prevents unwanted deletion of data and confusion
about the current preferences.
Bug: 39503
Change-Id: I5439a5f47b3bb05f4dab26139b0dc52d0ecd62c8
---
M TranslationNotifications.php
M TranslationNotificationsHooks.php
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslationNotifications.php b/TranslationNotifications.php
index 16d7c7e..dd7cac6 100644
--- a/TranslationNotifications.php
+++ b/TranslationNotifications.php
@@ -80,3 +80,5 @@
foreach ( range( 1, 3 ) as $langNum ) {
$wgDefaultUserOptions["translationnotifications-lang-$langNum"] = '';
}
+
+$wgHooks['GetPreferences'][] =
'TranslationNotificationsHooks::onGetPreferences';
diff --git a/TranslationNotificationsHooks.php
b/TranslationNotificationsHooks.php
index 03a6579..cab2d60 100644
--- a/TranslationNotificationsHooks.php
+++ b/TranslationNotificationsHooks.php
@@ -68,4 +68,22 @@
$languageCount // $10
)->inLanguage( $language )->text();
}
+
+ public static function onGetPreferences( $user, &$preferences ) {
+ foreach ( array(
+ 'translationnotifications-lang-1',
+ 'translationnotifications-lang-2',
+ 'translationnotifications-lang-3',
+ 'translationnotifications-cmethod-email',
+ 'translationnotifications-cmethod-talkpage',
+
'translationnotifications-cmethod-talkpage-elsewhere-loc',
+ 'translationnotifications-freq',
+ ) as $preference ) {
+ $preferences[$preference] = array(
+ 'type' => 'api',
+ );
+ }
+
+ return true;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/56922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5439a5f47b3bb05f4dab26139b0dc52d0ecd62c8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setting absent to a public id for chris johnson - change (operations/puppet)
RobH has submitted this change and it was merged.
Change subject: Setting absent to a public id for chris johnson
..
Setting absent to a public id for chris johnson
Change-Id: I9040db9888d33248066f3472cac244fbf1a0863a
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Cmjohnson: Checked; Looks good to me, but someone else must approve
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 5c4b798..491f74e 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -332,7 +332,7 @@
}
ssh_authorized_key {
"chrisj@chrisj-VPCEB23FM":
- ensure => present,
+ ensure => absent,
user=> $username,
type=> "ssh-rsa",
key =>
"B3NzaC1yc2EDAQABAAABAQDP7wD7CRHLh4V9Sjn72a/eh3hTQhprQ3fPxUX+G7oCGuRXmWAwHcoB2Rm7vZxiAEa6hA151YOEorYN8e6bYP0eqcpEu9G9cbDirnaAhKHf+r+n9OgJmpA8hDQQ0H4MuWH9W6uQLEi1Xl9Z41/u/LlfrmD9F77ed2jXCYAYgVwuNuO5lnOevMxLWH+aCtfYdp/QtEA9a+o2j0Dc0JveqXNFlCdcacLAME2q7ZHnyRwFndMgTiljnOSb3SjV/1tkNtq3Dkhnp1T3LXgSIX7gtxbfVd2u5b8HoaQYmpXSlRhyL+ulVJDJAEFVA+tp5lbcGK4kglNnBNKrQO9Bng+FlKwR";
--
To view, visit https://gerrit.wikimedia.org/r/56936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9040db9888d33248066f3472cac244fbf1a0863a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson
Gerrit-Reviewer: Cmjohnson
Gerrit-Reviewer: RobH
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] backport release notes from Ia6efdf931b0b6be7556fc16c040aa74... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: backport release notes from Ia6efdf931b0b6be7556fc16c040aa7493845cdfc .. backport release notes from Ia6efdf931b0b6be7556fc16c040aa7493845cdfc Change-Id: I274a7429130db05c2dc8bba9bd32d28b933747d3 --- M RELEASE-NOTES-1.21 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Demon: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index 50fd734..1824910 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -130,6 +130,7 @@ by adding a new configuration variable $wgApplyIpBlocksToXff (disabled by default). === Bug fixes in 1.21 === +* (bug 40617) Installer can now customize the logo in LocalSettings.php * (bug 40353) SpecialDoubleRedirect should support interwiki redirects. * (bug 40352) fixDoubleRedirects.php should support interwiki redirects. * (bug 9237) SpecialBrokenRedirect should not list interwiki redirects. -- To view, visit https://gerrit.wikimedia.org/r/56919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I274a7429130db05c2dc8bba9bd32d28b933747d3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MarkAHershberger Gerrit-Reviewer: Demon Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hi this is my first gerrit commit. Try and be nice to me. th... - change (test...examples)
Wavelander has uploaded a new change for review. https://gerrit.wikimedia.org/r/56938 Change subject: Hi this is my first gerrit commit. Try and be nice to me. thanks. .. Hi this is my first gerrit commit. Try and be nice to me. thanks. Change-Id: I1c660bd4a7d1eeaaeb101337dc2b64459efeca6d --- M Example/Example.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples refs/changes/38/56938/1 diff --git a/Example/Example.php b/Example/Example.php index c16bf94..2357cc1 100644 --- a/Example/Example.php +++ b/Example/Example.php @@ -38,5 +38,7 @@ // Add the i18n message file $wgExtensionMessagesFiles[ 'Example' ] = $current_dir . 'Example.i18n.php'; +$help = "identifies protocols needed to help you or someone out in times of major crisis."; + // Tell MediaWiki about the special page $wgSpecialPages[ 'Example' ] = 'SpecialExample'; -- To view, visit https://gerrit.wikimedia.org/r/56938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c660bd4a7d1eeaaeb101337dc2b64459efeca6d Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Wavelander ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed "flush on destruct" from StatCounter. - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56939
Change subject: Removed "flush on destruct" from StatCounter.
..
Removed "flush on destruct" from StatCounter.
Change-Id: Ib6ff0680d858e12969259997da163d0d696d65eb
---
M includes/StatCounter.php
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/39/56939/1
diff --git a/includes/StatCounter.php b/includes/StatCounter.php
index 30e5042..ca32793 100644
--- a/includes/StatCounter.php
+++ b/includes/StatCounter.php
@@ -134,8 +134,4 @@
// Disabled
}
}
-
- function __destruct() {
- $this->flush();
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/56939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6ff0680d858e12969259997da163d0d696d65eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Second try. Now third. - change (test...examples)
Wavelander has uploaded a new change for review. https://gerrit.wikimedia.org/r/56940 Change subject: Second try. Now third. .. Second try. Now third. Change-Id: Ic7cddbf04394c08bfe5cd240bf48e3641e7feaa5 --- M Example/Example.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples refs/changes/40/56940/1 diff --git a/Example/Example.php b/Example/Example.php index 2357cc1..c16bf94 100644 --- a/Example/Example.php +++ b/Example/Example.php @@ -38,7 +38,5 @@ // Add the i18n message file $wgExtensionMessagesFiles[ 'Example' ] = $current_dir . 'Example.i18n.php'; -$help = "identifies protocols needed to help you or someone out in times of major crisis."; - // Tell MediaWiki about the special page $wgSpecialPages[ 'Example' ] = 'SpecialExample'; -- To view, visit https://gerrit.wikimedia.org/r/56940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7cddbf04394c08bfe5cd240bf48e3641e7feaa5 Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Wavelander ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hi this is my first gerrit commit. Try and be nice to me. th... - change (test...examples)
Jeremyb has submitted this change and it was merged. Change subject: Hi this is my first gerrit commit. Try and be nice to me. thanks. .. Hi this is my first gerrit commit. Try and be nice to me. thanks. Change-Id: I1c660bd4a7d1eeaaeb101337dc2b64459efeca6d --- M Example/Example.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jeremyb: Verified; Looks good to me, approved diff --git a/Example/Example.php b/Example/Example.php index c16bf94..2357cc1 100644 --- a/Example/Example.php +++ b/Example/Example.php @@ -38,5 +38,7 @@ // Add the i18n message file $wgExtensionMessagesFiles[ 'Example' ] = $current_dir . 'Example.i18n.php'; +$help = "identifies protocols needed to help you or someone out in times of major crisis."; + // Tell MediaWiki about the special page $wgSpecialPages[ 'Example' ] = 'SpecialExample'; -- To view, visit https://gerrit.wikimedia.org/r/56938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c660bd4a7d1eeaaeb101337dc2b64459efeca6d Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Wavelander Gerrit-Reviewer: Jeremyb Gerrit-Reviewer: Sumanah ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Second try. Now third. - change (test...examples)
Jeremyb has submitted this change and it was merged. Change subject: Second try. Now third. .. Second try. Now third. Change-Id: Ic7cddbf04394c08bfe5cd240bf48e3641e7feaa5 --- M Example/Example.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jeremyb: Verified; Looks good to me, approved diff --git a/Example/Example.php b/Example/Example.php index 2357cc1..c16bf94 100644 --- a/Example/Example.php +++ b/Example/Example.php @@ -38,7 +38,5 @@ // Add the i18n message file $wgExtensionMessagesFiles[ 'Example' ] = $current_dir . 'Example.i18n.php'; -$help = "identifies protocols needed to help you or someone out in times of major crisis."; - // Tell MediaWiki about the special page $wgSpecialPages[ 'Example' ] = 'SpecialExample'; -- To view, visit https://gerrit.wikimedia.org/r/56940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7cddbf04394c08bfe5cd240bf48e3641e7feaa5 Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Wavelander Gerrit-Reviewer: Jeremyb Gerrit-Reviewer: Sumanah ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore compatiblity with MW 1.20 and 1.19 - change (mediawiki...AbuseFilter)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/56942 Change subject: Restore compatiblity with MW 1.20 and 1.19 .. Restore compatiblity with MW 1.20 and 1.19 Partly reverts I8e420f0259ef6c9e579f7a00beb58f28af9da37d (untested) Change-Id: Ib8634a3178a626f50f1150661842c16dc26c9516 --- M special/SpecialAbuseLog.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/42/56942/1 diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php index 2774c27..cc80c10 100644 --- a/special/SpecialAbuseLog.php +++ b/special/SpecialAbuseLog.php @@ -308,7 +308,8 @@ $diffEngine = new DifferenceEngine; $diffEngine->showDiffStyle(); - $formattedDiff = $diffEngine->generateTextDiffBody( $old_wikitext, $new_wikitext ); + // Note: generateDiffBody has been deprecated in favour of generateTextDiffBody in 1.21 but we can't use it for b/c + $formattedDiff = $diffEngine->generateDiffBody( $old_wikitext, $new_wikitext ); static $colDescriptions = " -- To view, visit https://gerrit.wikimedia.org/r/56942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8634a3178a626f50f1150661842c16dc26c9516 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused local variables - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused local variables
..
Remove unused local variables
Change-Id: I8eb774c2857dcc87404fd8a7e5fb66c5a4c9643e
---
M includes/api/ApiCreateAccount.php
M includes/api/ApiImageRotate.php
M includes/api/ApiQuery.php
3 files changed, 0 insertions(+), 7 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiCreateAccount.php
b/includes/api/ApiCreateAccount.php
index 55c60cc..a521346 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -43,8 +43,6 @@
$params = $this->extractRequestParams();
- $result = array();
-
// Init session if necessary
if ( session_id() == '' ) {
wfSetupSession();
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index ebdbedd..5aa41ea 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -53,16 +53,13 @@
}
}
-
public function execute() {
$params = $this->extractRequestParams();
$rotation = $params['rotation'];
- $user = $this->getUser();
$pageSet = $this->getPageSet();
$pageSet->execute();
- $result = array();
$result = array();
self::addValues( $result, $pageSet->getInvalidTitles(),
'invalid', 'title' );
@@ -181,7 +178,6 @@
}
public function getAllowedParams( $flags = 0 ) {
- $pageSet = $this->getPageSet();
$result = array(
'rotation' => array(
ApiBase::PARAM_TYPE => array( '90', '180',
'270' ),
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 7c64996..02c1b27 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -382,7 +382,6 @@
$modules = $allModules;
$tmp = $completeModules;
$wasPosted = $this->getRequest()->wasPosted();
- $main = $this->getMain();
/** @var $module ApiQueryBase */
foreach ( $allModules as $moduleName => $module ) {
--
To view, visit https://gerrit.wikimedia.org/r/56930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb774c2857dcc87404fd8a7e5fb66c5a4c9643e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing dependency - change (mediawiki...MobileFrontend)
JGonera has uploaded a new change for review. https://gerrit.wikimedia.org/r/56943 Change subject: Add missing dependency .. Add missing dependency carousel.js and uploads.js depend on View and Api which are in mobile.stable. Change-Id: I0b6ad6ebc2d2664fca898b857ab14ecf29c4db8c --- M MobileFrontend.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/43/56943/1 diff --git a/MobileFrontend.php b/MobileFrontend.php index 2567ac0..e4f830a 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -592,6 +592,7 @@ $wgResourceModules['mobile.uploads.scripts'] = $wgMFMobileResourceBoilerplate + array( 'dependencies' => array( 'mobile.uploads.plumbing', + 'mobile.stable', ), 'messages' => array( 'mobile-frontend-photo-upload-generic', -- To view, visit https://gerrit.wikimedia.org/r/56943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b6ad6ebc2d2664fca898b857ab14ecf29c4db8c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: JGonera ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing dependency - change (mediawiki...MobileFrontend)
Jdlrobson has submitted this change and it was merged. Change subject: Add missing dependency .. Add missing dependency carousel.js and uploads.js depend on View and Api which are in mobile.stable. Change-Id: I0b6ad6ebc2d2664fca898b857ab14ecf29c4db8c --- M MobileFrontend.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jdlrobson: Verified; Looks good to me, approved diff --git a/MobileFrontend.php b/MobileFrontend.php index 2567ac0..e4f830a 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -592,6 +592,7 @@ $wgResourceModules['mobile.uploads.scripts'] = $wgMFMobileResourceBoilerplate + array( 'dependencies' => array( 'mobile.uploads.plumbing', + 'mobile.stable', ), 'messages' => array( 'mobile-frontend-photo-upload-generic', -- To view, visit https://gerrit.wikimedia.org/r/56943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b6ad6ebc2d2664fca898b857ab14ecf29c4db8c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: JGonera Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use double quotes to use variable $oper properly - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use double quotes to use variable $oper properly
..
Use double quotes to use variable $oper properly
Introduced in Change-Id: I29461e5332f3fc6523cbd899e14394aa88865d93
Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
---
M includes/actions/HistoryAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index f2e61a5..245a5bd 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -224,7 +224,7 @@
}
if ( $offset ) {
- $offsets = array( 'rev_timestamp $oper ' .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
+ $offsets = array( "rev_timestamp $oper " .
$dbr->addQuotes( $dbr->timestamp( $offset ) ) );
} else {
$offsets = array();
}
--
To view, visit https://gerrit.wikimedia.org/r/56928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e8d133fc9ab362f3f463309d799e80fff5d883
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: Reedy
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update/fix PHPDocs - change (mediawiki/core)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56944
Change subject: Update/fix PHPDocs
..
Update/fix PHPDocs
Change-Id: Ifa3cfc6fe38ea45e70b50683c36e7cbf3bb4ef82
---
M includes/specials/SpecialAllmessages.php
M includes/specials/SpecialAllpages.php
M includes/specials/SpecialEmailuser.php
M includes/specials/SpecialExport.php
M includes/specials/SpecialLinkSearch.php
M includes/specials/SpecialProtectedpages.php
M includes/specials/SpecialProtectedtitles.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialStatistics.php
M includes/specials/SpecialUnblock.php
M includes/specials/SpecialUploadStash.php
M includes/specials/SpecialUserrights.php
M includes/specials/SpecialWatchlist.php
M includes/specials/SpecialWhatlinkshere.php
14 files changed, 33 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/56944/1
diff --git a/includes/specials/SpecialAllmessages.php
b/includes/specials/SpecialAllmessages.php
index 855d409..7f315de 100644
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -285,6 +285,9 @@
/**
* This function normally does a database query to get the results; we
need
* to make a pretend result using a FakeResultWrapper.
+* @param string $offset
+* @param int $limit
+* @param bool $descending
* @return FakeResultWrapper
*/
function reallyDoQuery( $offset, $limit, $descending ) {
diff --git a/includes/specials/SpecialAllpages.php
b/includes/specials/SpecialAllpages.php
index 942b767..7505df8 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -335,7 +335,7 @@
}
/**
-* @param $namespace Integer (Default NS_MAIN)
+* @param int $namespace Namespace (Default NS_MAIN)
* @param string $from list all pages from this name (default FALSE)
* @param string $to list all pages to this name (default FALSE)
* @param bool $hideredirects dont show redirects (default FALSE)
diff --git a/includes/specials/SpecialEmailuser.php
b/includes/specials/SpecialEmailuser.php
index 163e5c6..3607be9 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -264,6 +264,8 @@
* getPermissionsError(). It is probably also a good
* idea to check the edit token and ping limiter in advance.
*
+* @param array $data
+* @param IContextSource $context
* @return Mixed: Status object, or potentially a String on error
* or maybe even true on success if anything uses the EmailUser hook.
*/
diff --git a/includes/specials/SpecialExport.php
b/includes/specials/SpecialExport.php
index ed3321e..7c0b378 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -526,6 +526,11 @@
/**
* Expand a list of pages to include items used in those pages.
+* @param string[] $inputPages
+* @param $pageSet
+* @param string $table
+* @param string[] $fields Field names
+* @param $join
* @return array
*/
private function getLinks( $inputPages, $pageSet, $table, $fields,
$join ) {
diff --git a/includes/specials/SpecialLinkSearch.php
b/includes/specials/SpecialLinkSearch.php
index 030416f..1bd33df 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -133,6 +133,8 @@
/**
* Return an appropriately formatted LIKE query and the clause
*
+* @param string $query
+* @param string $prot
* @return array
*/
static function mungeQuery( $query, $prot ) {
diff --git a/includes/specials/SpecialProtectedpages.php
b/includes/specials/SpecialProtectedpages.php
index bc4f3bb..4bcafc7 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -205,6 +205,7 @@
}
/**
+* @param bool $indefOnly
* @return string Formatted HTML
*/
protected function getExpiryCheck( $indefOnly ) {
@@ -212,6 +213,7 @@
}
/**
+* @param bool $cascadeOnly
* @return string Formatted HTML
*/
protected function getCascadeCheck( $cascadeOnly ) {
@@ -219,6 +221,8 @@
}
/**
+* @param string $sizetype
+* @param mixed $size
* @return string Formatted HTML
*/
protected function getSizeLimit( $sizetype, $size ) {
diff --git a/includes/specials/SpecialProtectedtitles.php
b/includes/specials/SpecialProtectedtitles.php
index a9d9cff..7eafc55 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -69,6
[MediaWiki-commits] [Gerrit] fixing spacing error - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56945
Change subject: fixing spacing error
..
fixing spacing error
Change-Id: Ic43c0aa9b97248adc06a4a2d5426b46cc414ca52
---
M files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/56945/1
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 584f43a..d4b6197 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3587,7 +3587,7 @@
}
host rdb1 {
- hardware ethernet90:B1:1C:36:A1:99;
+ hardware ethernet 90:B1:1C:36:A1:99;
fixed-address rdb1.pmtpa.wmnet;
}
--
To view, visit https://gerrit.wikimedia.org/r/56945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic43c0aa9b97248adc06a4a2d5426b46cc414ca52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
