gmane.org.wikimedia.mediawiki.cvs

[MediaWiki-commits] [Gerrit] Restore window overlays - change(mediawiki...VisualEditor)

Trevor Parscal (Code Review — 2013-05-25T13:45:02

Trevor Parscal has uploaded a new change for review.

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


Change subject: Restore window overlays
......................................................................

Restore window overlays

And use them for the category widget for it's popup.

Change-Id: I43db14c749400efa6a770343afbdfa16dd6bff30
---
M modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve/ui/styles/ve.ui.Window.css
M modules/ve/ui/ve.ui.Window.js
3 files changed, 14 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js b/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
index 5dfa2eb..24a967b 100644
--- a/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
< at >< at > -62,7 +62,7 < at >< at >
 '$$': this.frame.$$, 'label': ve.msg( 'visualeditor-dialog-meta-categories-settings-label' ), 'icon': 'settings'
 } );
 this.categoryWidget = new ve.ui.MWCategoryWidget( {
-'$$': this.frame.$$, '$overlay': this.surface.$globalOverlay
+'$$': this.frame.$$, '$overlay': this.$overlay
 } );
 this.defaultSortInput = new ve.ui.TextInputWidget( {
 '$$': this.frame.$$, 'placeholder': this.fallbackDefaultSortKey
diff --git a/modules/ve/ui/styles/ve.ui.Window.css b/modules/ve/ui/styles/ve.ui.Window.css
index 0142ff5..fb7a1fc 100644
--- a/modules/ve/ui/styles/ve.ui.Window.css
+++ b/modules/ve/ui/styles/ve.ui.Window.css
< at >< at > -38,3 +38,13 < at >< at >
 white-space: nowrap;
 cursor: default;
 }
+
+.ve-ui-window-overlay {
+font-family: sans-serif;
+line-height: 1.5em;
+font-size: 1em;
+position: absolute;
+top: 0;
+left: 0;
+z-index: 1000;
+}
diff --git a/modules/ve/ui/ve.ui.Window.js b/modules/ve/ui/ve.ui.Window.js
index 85a6591..62d45fa 100644
--- a/modules/ve/ui/ve.ui.Window.js
+++ b/modules/ve/ui/ve.ui.Window.js
< at >< at > -171,12 +171,14 < at >< at >
 this.$head = this.$$( '<div class="ve-ui-window-head"></div>' );
 this.$body = this.$$( '<div class="ve-ui-window-body"></div>' );
 this.$foot = this.$$( '<div class="ve-ui-window-foot"></div>' );
+this.$overlay = this.$$( '<div class="ve-ui-window-overlay"></div>' );
 
 // Initialization
 this.frame.$content.append(
 this.$head.append( this.$icon, this.$title ),
 this.$body,
-this.$foot
+this.$foot,
+this.$overlay
 );
 };

[MediaWiki-commits] [Gerrit] Forgot to update release notes -change (mediawiki/core)

MarkAHershberger (Code Review — 2013-05-25T13:34:51

MarkAHershberger has uploaded a new change for review.

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


Change subject: Forgot to update release notes
......................................................................

Forgot to update release notes

Change-Id: Ic0c3934b3aa86297a33918ff1b31406909ad68a2
---
M RELEASE-NOTES-1.21
1 file changed, 12 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/65451/1

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index be41ca0..db79956 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
< at >< at > -3,12 +3,10 < at >< at >
 
 == MediaWiki 1.21 ==
 
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.21 is an alpha-quality branch and is not recommended for use in
-production.
+MediaWiki 1.21 is an stable branch and is recommended for use in production.
 
 === Configuration changes in 1.21 ===
+* (bug 48306) $wgAllowChunkedUploads has been added and is false by default.
 * (bug 29374) $wgVectorUseSimpleSearch is now enabled by default.
 * Deprecated $wgAllowRealName is removed. Use $wgHiddenPrefs[] = 'realname'
   instead.
< at >< at > -223,6 +221,11 < at >< at >
 === API changes in 1.21 ===
 * BREAKING CHANGE: Chunked uploads are now disabled by default.  You can re-enable
   them by setting $wgAllowChunkedUploads=true
+* BREAKING CHANGE: list=logevents output format changed for details of some log
+  types. Specifically, details that were formerly reported under a key like
+  "4::foo" will now be reported under a key of simply "foo".
+* BREAKING CHANGE: '??_badcontinue' error code was changed to '??badcontinue'
+  for all query modules.
 * prop=revisions can now report the contentmodel and contentformat.
   See docs/contenthandler.txt.
 * action=edit and action=parse now support contentmodel and contentformat
< at >< at > -241,11 +244,6 < at >< at >
   the same query. When both are present, 'from' is simply ignored.
 * list=alllinks & alltransclusions now allow 'unique' in generators, to yield
   a list of all link/template target pages instead of source pages.
-* BREAKING CHANGE: list=logevents output format changed for details of some log
-  types. Specifically, details that were formerly reported under a key like
-  "4::foo" will now be reported under a key of simply "foo".
-* BREAKING CHANGE: '??_badcontinue' error code was changed to '??badcontinue'
-  for all query modules.
 * ApiQueryBase adds 'badcontinue' error code if module has 'continue' parameter.
 * (bug 35885) Removed version parameter and all getVersion() methods.
 * action=options now takes a "resetkinds" option, which allows only resetting
< at >< at > -288,18 +286,18 < at >< at >
 * (bug 33304) list=allpages will now find really old indefinite protections.
 * (bug 45937) meta=allmessages will report a syntactically invalid lang as a
   proper error instead of as an uncaught exception.
-* (bug 48542) SpecialStatistics::getOtherStats() now uses the user language
+* (bug 48542) SpecialStatistics::getOtherStats() now uses the user language.
 
 === API internal changes in 1.21 ===
+* BREAKING CHANGE: ApiPageSet constructor now has two params instead of three, with only the
+  first one keeping its meaning. ApiPageSet is now derived from ApiBase.
+* BREAKING CHANGE: ApiQuery::newGenerator() and executeGeneratorModule() were deleted.
 * For debugging only, a new global $wgDebugAPI removes many API restrictions when true.
   Never use on the production servers, as this flag introduces security holes.
   Whenever enabled, a warning will also be added to all output.
 * ApiModuleManager now handles all submodules (actions,props,lists) and instantiation
 * Query stores prop/list/meta as submodules
 * ApiPageSet can now be used in any action to process titles/pageids/revids or any generator.
-* BREAKING CHANGE: ApiPageSet constructor now has two params instead of three, with only the
-  first one keeping its meaning. ApiPageSet is now derived from ApiBase.
-* BREAKING CHANGE: ApiQuery::newGenerator() and executeGeneratorModule() were deleted.
 * ApiQueryGeneratorBase::setGeneratorMode() now requires a pageset param.
 * $wgAPIGeneratorModules is now obsolete and will be ignored.
 * Added flags ApiResult::OVERRIDE and ADD_ON_TOP to setElement() and addValue()
< at >< at > -327,7 +325,6 < at >< at >
   were using it, you have to either copy it to your extension, or install the
   Vector extension (and possibly disable its features using config settings if
   you don't want them).
-* Experimental IBM DB2 support was removed due to lack of interest and maintainership.
 * BREAKING CHANGE: Filenames of maintenance scripts were standardized into
   lowerCamelCase format, and made more explicit:
   - clear_stats.php -> clearCacheStats.php
< at >< at > -343,6 +340,7 < at >< at >
   - ShowStats -> ShowSiteStats.
 * BREAKING CHANGE: (bug 38244) Removed the mediawiki.api.titleblacklist module
   and moved it to the TitleBlacklist extension.
+* Experimental IBM DB2 support was removed due to lack of interest and maintainership.
 
 == Compatibility ==

[MediaWiki-commits] [Gerrit] Update formatting - change(mediawiki...Translate)

Siebrand (Code Review — 2013-05-25T13:34:19

Siebrand has uploaded a new change for review.

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


Change subject: Update formatting
......................................................................

Update formatting

Reduces PHP CodeSniffer warnings.

Change-Id: If42cef712e5242f39cec3f907934dfd7f6ea1109
---
M MessageChecks.php
M api/ApiAggregateGroups.php
M api/ApiGroupReview.php
M ffs/MediaWikiComplexMessages.php
M scripts/sync-group.php
M utils/StatsTable.php
6 files changed, 73 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/50/65450/1

diff --git a/MessageChecks.php b/MessageChecks.php
index 27a2c97..58ad1f7 100644
--- a/MessageChecks.php
+++ b/MessageChecks.php
< at >< at > -297,7 +297,8 < at >< at >
  * < at >param array $warnings Array where warnings are appended to.
  */
 protected function pythonInterpolationCheck( $messages, $code, array &$warnings ) {
-$this->parameterCheck( $messages, $code, $warnings, '/\%\([a-zA-Z0-9]*?\)[diouxXeEfFgGcrs]/U' );
+$pattern = '/\%\([a-zA-Z0-9]*?\)[diouxXeEfFgGcrs]/U';
+$this->parameterCheck( $messages, $code, $warnings, $pattern );
 }
 
 /**
diff --git a/api/ApiAggregateGroups.php b/api/ApiAggregateGroups.php
index ed85c68..f5e8475 100644
--- a/api/ApiAggregateGroups.php
+++ b/api/ApiAggregateGroups.php
< at >< at > -75,7 +75,9 < at >< at >
  * aggregate message groups, the message group object $group
  * might not always be available. In this case we need to fake
  * some title. */
-$title = $group ? $group->getTitle() : Title::newFromText( "Special:Translate/$subgroupId" );
+$title = $group ?
+$group->getTitle() :
+Title::newFromText( "Special:Translate/$subgroupId" );
 
 $entry = new ManualLogEntry( 'pagetranslation', $action );
 $entry->setPerformer( $this->getUser() );
< at >< at > -121,7 +123,6 < at >< at >
 $output['groups'] = self::getAllPages();
 $output['aggregategroupId'] = $aggregateGroupId;
 // < at >todo Logging
-
 }
 
 // If we got this far, nothing has failed
< at >< at > -137,7 +138,8 < at >< at >
 if ( strlen( $aggregateGroupName ) + strlen( $prefix ) >= 200 ) {
 return $prefix . substr( sha1( $aggregateGroupName ), 0, 5 );
 } else {
-return $prefix . preg_replace( '/[\x00-\x1f\x23\x27\x2c\x2e\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f\s]+/i', '_', $aggregateGroupName );
+$pattern = '/[\x00-\x1f\x23\x27\x2c\x2e\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f\s]+/i';
+return $prefix . preg_replace( $pattern, '_', $aggregateGroupName );
 }
 }
 
diff --git a/api/ApiGroupReview.php b/api/ApiGroupReview.php
index d447517..0a9ca75 100644
--- a/api/ApiGroupReview.php
+++ b/api/ApiGroupReview.php
< at >< at > -169,9 +169,12 < at >< at >
 
 return array_merge( parent::getPossibleErrors(), array(
 array( 'code' => 'permissiondenied', 'info' => "You must have $right right" ),
-array( 'code' => 'disabled', 'info' => "Message group workflows are not in use" ),
-array( 'code' => 'sameworkflowstate', 'info' => "The requested state is identical to the current state" ),
-array( 'code' => 'invalidstate', 'info' => "The requested state is invalid" ),
+array( 'code' => 'disabled', 'info' => 'Message group workflows are not in use' ),
+array(
+'code' => 'sameworkflowstate',
+'info' => 'The requested state is identical to the current state'
+),
+array( 'code' => 'invalidstate', 'info' => 'The requested state is invalid' ),
 ) );
 }
 
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index d3ba150..2fede42 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
< at >< at > -296,7 +296,9 < at >< at >
 $rowContents .= '<td>' . $this->formatElement( $value ) . '</td>';
 
 $value = $this->val( $group, self::LANG_CURRENT, $key );
-$rowContents .= '<td>' . $this->editElement( $key, $this->formatElement( $value ) ) . '</td>';
+$rowContents .= '<td>';
+$rowContents .= $this->editElement( $key, $this->formatElement( $value ) );
+$rowContents .= '</td>';
 
 $s .= Xml::tags( 'tr', array( 'id' => "mw-sp-magic-$key" ), $rowContents );
 }
< at >< at > -321,9 +323,15 < at >< at >
 }
 
 public function getButtons() {
-return
-Xml::inputLabel( wfMessage( 'translate-magic-cm-comment' )->text(), 'comment', 'sp-translate-magic-comment' ) .
-Xml::submitButton( wfMessage( 'translate-magic-cm-save' )->text(), array( 'name' => 'savetodb' ) );
+return Xml::inputLabel(
+wfMessage( 'translate-magic-cm-comment' )->text(),
+'comment',
+'sp-translate-magic-comment'
+) .
+Xml::submitButton(
+wfMessage( 'translate-magic-cm-save' )->text(),
+array( 'name' => 'savetodb' )
+);
 }
 
 public function formatElement( $element ) {
< at >< at > -398,9 +406,13 < at >< at >
 $title = Title::newFromText( 'MediaWiki:' . $this->getKeyForSave() );
 $article = new Article( $title );
 
-$data = "# DO NOT EDIT THIS PAGE DIRECTLY! Use [[Special:AdvancedTranslate]].\n<pre>\n" . $this->formatForSave( $request ) . "\n</pre>";
+$data = "# DO NOT EDIT THIS PAGE DIRECTLY! Use [[Special:AdvancedTranslate]].\n<pre>\n" .
+$this->formatForSave( $request ) . "\n</pre>";
 
-$comment = $request->getText( 'comment', wfMessage( 'translate-magic-cm-updatedusing' )->inContentLanguage()->text() );
+$comment = $request->getText(
+'comment',
+wfMessage( 'translate-magic-cm-updatedusing' )->inContentLanguage()->text()
+);
 $status = $article->doEdit( $data, $comment, 0 );
 
 if ( $status === false || ( is_object( $status ) && !$status->isOK() ) ) {
< at >< at > -441,8 +453,13 < at >< at >
 foreach ( $values as $v ) {
 if ( isset( $used[$v] ) ) {
 $otherkey = $used[$v];
-$first = Xml::element( 'a', array( 'href' => "#mw-sp-magic-$otherkey" ), $otherkey );
-$errors[] = "Translation <strong>$v</strong> is used more than once for $first and $link.";
+$first = Xml::element(
+'a',
+array( 'href' => "#mw-sp-magic-$otherkey" ),
+$otherkey
+);
+$errors[] = "Translation <strong>$v</strong> is used more than once " .
+"for $first and $link.";
 } else {
 $used[$v] = $key;
 }
< at >< at > -477,7 +494,9 < at >< at >
 
 $indexKeys = array();
 foreach ( array_keys( $items[self::LANG_MASTER] ) as $key ) {
-$indexKeys[$key] = isset( $this->constants[$key] ) ? $this->constants[$key] : "'$key'";
+$indexKeys[$key] = isset( $this->constants[$key] ) ?
+$this->constants[$key] :
+"'$key'";
 }
 
 $padTo = max( array_map( 'strlen', $indexKeys ) ) + 3;
< at >< at > -608,7 +627,8 < at >< at >
 public function highlight( $key, $values ) {
 if ( count( $values ) ) {
 if ( !isset( $values[0] ) ) {
-throw new MWException( "Something missing from values: " . print_r( $values, true ) );
+throw new MWException( "Something missing from values: " .
+print_r( $values, true ) );
 }
 
 $values[0] = "<strong>$values[0]</strong>";
< at >< at > -636,7 +656,8 < at >< at >
 $text = $title->getText();
 $dbkey = $title->getDBkey();
 if ( $text !== $_ && $dbkey !== $_ ) {
-$errors[] = "Translation <strong>$_</strong> for $link is not in normalised form, which is <strong>$text</strong>";
+$errors[] = "Translation <strong>$_</strong> for $link is not in " .
+"normalised form, which is <strong>$text</strong>";
 }
 }
 }
< at >< at > -743,7 +764,8 < at >< at >
 
 if ( count( $values ) > 1 ) {
 $link = Xml::element( 'a', array( 'href' => "#mw-sp-magic-$key" ), $key );
-$errors[] = "Namespace $link can have only one translation. Replace the translation with a new one, and notify staff about the change.";
+$errors[] = "Namespace $link can have only one translation. Replace the " .
+"translation with a new one, and notify staff about the change.";
 }
 }
 }
diff --git a/scripts/sync-group.php b/scripts/sync-group.php
index 1bce00e..6ec9b53 100644
--- a/scripts/sync-group.php
+++ b/scripts/sync-group.php
< at >< at > -1,6 +1,7 < at >< at >
 <?php
 /**
- * Command line script to import/update source messages and translations into the wiki database.
+ * Command line script to import/update source messages and translations into
+ * the wiki database.
  *
  * < at >author Niklas Laxström
  * < at >author Siebrand Mazeland
< at >< at > -63,7 +64,8 < at >< at >
 $start = isset( $options['start'] ) ? strtotime( $options['start'] ) : false;
 $end = isset( $options['end'] ) ? strtotime( $options['end'] ) : false;
 
-STDOUT( "Conflict times: " . wfTimestamp( TS_ISO_8601, $start ) . " - " . wfTimestamp( TS_ISO_8601, $end ) );
+STDOUT( "Conflict times: " . wfTimestamp( TS_ISO_8601, $start ) . " - " .
+wfTimestamp( TS_ISO_8601, $end ) );
 
 $codes = array_filter( array_map( 'trim', explode( ',', $options['lang'] ) ) );
 
< at >< at > -223,8 +225,10 < at >< at >
 /**
  * Do some conflict resolution for translations.
  * < at >param string $code Language code.
- * < at >param bool|int $startTs Time of the last export (changes in wiki after this will conflict)
- * < at >param bool|int $endTs Time of the last export (changes in source before this wont conflict)
+ * < at >param bool|int $startTs Time of the last export (changes in wiki after
+ * this will conflict)
+ * < at >param bool|int $endTs Time of the last export (changes in source before
+ * this won't conflict)
  * < at >param bool|int $changeTs When change happened in the source.
  */
 public function checkConflicts( $code, $startTs = false, $endTs = false, $changeTs = false ) {
< at >< at > -300,7 +304,11 < at >< at >
 continue;
 } elseif ( !$wikiTs || ( $changeTs > $endTs && $wikiTs < $startTs ) ) {
 STDOUT( " →Changed in source after export: IMPORT", $page );
-$this->import( $title, $translation, 'Updating translation from external source' );
+$this->import(
+$title,
+$translation,
+'Updating translation from external source'
+);
 continue;
 }
 }
< at >< at > -325,12 +333,20 < at >< at >
 }
 
 if ( $action === 'I' ) {
-$this->import( $title, $translation, 'Updating translation from external source' );
+$this->import(
+$title,
+$translation,
+'Updating translation from external source'
+);
 break;
 }
 
 if ( $action === 'C' ) {
-$this->import( $title, TRANSLATE_FUZZY . $translation, 'Edit conflict between wiki and source' );
+$this->import(
+$title,
+TRANSLATE_FUZZY . $translation,
+'Edit conflict between wiki and source'
+);
 break;
 }
 } while ( true );
diff --git a/utils/StatsTable.php b/utils/StatsTable.php
index 065bff3..d28176b 100644
--- a/utils/StatsTable.php
+++ b/utils/StatsTable.php
< at >< at > -61,7 +61,9 < at >< at >
 }
 
 public function getBackgroundColor( $subset, $total, $fuzzy = false ) {
-$v = < at >round( 255 * $subset / $total );
+wfSuppressWarnings();
+$v = round( 255 * $subset / $total );
+wfRestoreWarnings();
 
 if ( $fuzzy ) {
 // Weigh fuzzy with factor 20.

[MediaWiki-commits] [Gerrit] (bug 48798) Customise linktrail forGujarati (gu) - change (mediawiki/core)

Nemo bis (Code Review — 2013-05-25T13:32:39

Nemo bis has uploaded a new change for review.

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


Change subject: (bug 48798) Customise linktrail for Gujarati (gu)
......................................................................

(bug 48798) Customise linktrail for Gujarati (gu)

Release notes will follow with another commit when this is merged.

Change-Id: I872a9f141f64a664bc3743fcff5f036634445ba0
---
M languages/messages/MessagesGu.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/49/65449/1

diff --git a/languages/messages/MessagesGu.php b/languages/messages/MessagesGu.php
index 5932cd0..6cf767c 100644
--- a/languages/messages/MessagesGu.php
+++ b/languages/messages/MessagesGu.php
< at >< at > -148,6 +148,8 < at >< at >
 
 $digitGroupingPattern = "##,##,###";
 
+$linkTrail = '/^((?:[a-z]|ક્|ખ્|ગ્|ઘ્|ચ્|છ્|જ્|ઝ્|ટ્|ઠ્|ડ્|ઢ્|ણ્|ત્|થ્|દ્|ધ્|ન્|પ્|ફ્|બ્|ભ્|મ્|ય્|ર્|લ્|વ્|સ્|શ્|ષ્|હ્|ળ્|ક્ષ્|જ્ઞ્|અ|આ|ઇ|ઈ|ઉ|ઊ|એ|ઐ|ઓ|ઔ|અં|અઃ|અઁ|ઍ|ઑ|ઋ|ઁ|઼|।)+)(.*)$/sDu';
+
 $messages = array(
 # User preference toggles
 'tog-underline' => 'કડીઓની નીચે લીટી (અંડરલાઇન) ઉમેરો:',

[MediaWiki-commits] [Gerrit] Allow VirtualBox to manage permissionsof shared files - change (mediawiki/vagrant)

Ori.livneh (Code Review — 2013-05-25T13:24:51

Ori.livneh has uploaded a new change for review.

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


Change subject: Allow VirtualBox to manage permissions of shared files
......................................................................

Allow VirtualBox to manage permissions of shared files

Specifying fmode/dmode parameters to VirtualBox makes it more difficult to use
NFS as the implementation for folder-sharing, and makes it too easy to write
Puppet code that causes an endless file permission back-and-forth between
Puppet and VirtualBox.

Change-Id: I1d4a184e627ef072126ed19d505de4c53efbe141
---
M Vagrantfile
M puppet/modules/mediawiki/manifests/extension.pp
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/48/65448/1

diff --git a/Vagrantfile b/Vagrantfile
index b0a7c0b..ba72218 100644
--- a/Vagrantfile
+++ b/Vagrantfile
< at >< at > -67,8 +67,7 < at >< at >
     config.vm.synced_folder '.', '/vagrant',
         id: 'vagrant-root',
         owner: 'vagrant',
-        group: 'www-data',
-        extra: 'dmode=775,fmode=775'
+        group: 'www-data'
 
     config.vm.provider :virtualbox do |vb|
         # See http://www.virtualbox.org/manual/ch08.html for additional options.
diff --git a/puppet/modules/mediawiki/manifests/extension.pp b/puppet/modules/mediawiki/manifests/extension.pp
index 4cb62e8..6f66613 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
< at >< at > -96,7 +96,6 < at >< at >
 # over the file.
 owner   => 'vagrant',
 group   => 'www-data',
-mode    => '0770',
 require => Git::Clone["mediawiki/extensions/${extension}"],
 }

[MediaWiki-commits] [Gerrit] More degloblization - change(mediawiki...Translate)

Siebrand (Code Review — 2013-05-25T13:14:37

Siebrand has uploaded a new change for review.

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


Change subject: More degloblization
......................................................................

More degloblization

Change-Id: If57556243b428faf987ba320d6438528746904e0
---
M MediaWikiMessageChecker.php
M MessageChecks.php
M api/ApiAggregateGroups.php
M api/ApiGroupReview.php
M api/ApiHardMessages.php
M api/ApiTranslateSandbox.php
M api/ApiTranslationReview.php
M ffs/MediaWikiComplexMessages.php
M scripts/createCheckIndex.php
M scripts/fuzzy.php
M scripts/sync-group.php
M specials/SpecialTranslate.php
M tag/PageTranslationHooks.php
M tag/TranslateDeleteJob.php
M tag/TranslateMoveJob.php
M tests/api/ApiTokensTest.php
M utils/JsSelectToInput.php
M utils/MessageTable.php
M utils/MessageWebImporter.php
M utils/RcFilter.php
M utils/StatsTable.php
M utils/TranslationEditPage.php
M utils/TranslationHelpers.php
M utils/UserToggles.php
24 files changed, 188 insertions(+), 182 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/47/65447/1

diff --git a/MediaWikiMessageChecker.php b/MediaWikiMessageChecker.php
index c83891a..7002b29 100644
--- a/MediaWikiMessageChecker.php
+++ b/MediaWikiMessageChecker.php
< at >< at > -338,17 +338,13 < at >< at >
 $defCount = count( $defArray );
 $traCount = count( $traArray );
 if ( $defCount !== $traCount ) {
-global $wgLang;
-
 $warnings[$key][] = array(
 array( 'miscmw', $subcheck, $key, $code ),
 'translate-checks-format',
-wfMessage(
-'translate-checks-parametersnotequal',
-$wgLang->formatNum( $traCount ),
-$wgLang->formatNum( $defCount )
-)->text()
+wfMessage( 'translate-checks-parametersnotequal' )
+->numParams( $traCount, $defCount )->text()
 );
+
 continue;
 }
 
diff --git a/MessageChecks.php b/MessageChecks.php
index 8ae1362..27a2c97 100644
--- a/MessageChecks.php
+++ b/MessageChecks.php
< at >< at > -223,7 +223,7 < at >< at >
  * < at >return array List of warning messages with parameters.
  */
 protected function fixMessageParams( $warnings ) {
-global $wgLang;
+$lang = RequestContext::getMain()->getLanguage();
 
 foreach ( $warnings as $wkey => $warning ) {
 array_shift( $warning );
< at >< at > -235,9 +235,9 < at >< at >
 } else {
 list( $type, $value ) = $param;
 if ( $type === 'COUNT' ) {
-$message[] = $wgLang->formatNum( $value );
+$message[] = $lang->formatNum( $value );
 } elseif ( $type === 'PARAMS' ) {
-$message[] = $wgLang->commaList( $value );
+$message[] = $lang->commaList( $value );
 } else {
 throw new MWException( "Unknown type $type" );
 }
diff --git a/api/ApiAggregateGroups.php b/api/ApiAggregateGroups.php
index 5f20f25..ed85c68 100644
--- a/api/ApiAggregateGroups.php
+++ b/api/ApiAggregateGroups.php
< at >< at > -20,9 +20,7 < at >< at >
 protected static $salt = 'translate-manage';
 
 public function execute() {
-global $wgUser;
-
-if ( !$wgUser->isallowed( self::$right ) ) {
+if ( !$this->getUser()->isallowed( self::$right ) ) {
 $this->dieUsage( 'Permission denied', 'permissiondenied' );
 }
 
< at >< at > -68,7 +66,7 < at >< at >
 
 TranslateMetadata::setSubgroups( $aggregateGroup, $subgroups );
 
-$logparams = array(
+$logParams = array(
 'aggregategroup' => TranslateMetadata::get( $aggregateGroup, 'name' ),
 'aggregategroup-id' => $aggregateGroup,
 );
< at >< at > -80,11 +78,11 < at >< at >
 $title = $group ? $group->getTitle() : Title::newFromText( "Special:Translate/$subgroupId" );
 
 $entry = new ManualLogEntry( 'pagetranslation', $action );
-$entry->setPerformer( $wgUser );
+$entry->setPerformer( $this->getUser() );
 $entry->setTarget( $title );
 // < at >todo
 // $entry->setComment( $comment );
-$entry->setParameters( $logparams );
+$entry->setParameters( $logParams );
 
 $logid = $entry->insert();
 $entry->publish( $logid );
< at >< at > -230,12 +228,12 < at >< at >
 }
 
 public static function getToken() {
-global $wgUser;
-if ( !$wgUser->isAllowed( self::$right ) ) {
+$user = RequestContext::getMain()->getUser();
+if ( !$user->isAllowed( self::$right ) ) {
 return false;
 }
 
-return $wgUser->getEditToken( self::$salt );
+return $user->getEditToken( self::$salt );
 }
 
 public static function injectTokenFunction( &$list ) {
diff --git a/api/ApiGroupReview.php b/api/ApiGroupReview.php
index ffd8a56..d447517 100644
--- a/api/ApiGroupReview.php
+++ b/api/ApiGroupReview.php
< at >< at > -190,12 +190,12 < at >< at >
 }
 
 public static function getToken() {
-global $wgUser;
-if ( !$wgUser->isAllowed( self::$right ) ) {
+$user = RequestContext::getMain()->getUser();
+if ( !$user->isAllowed( self::$right ) ) {
 return false;
 }
 
-return $wgUser->getEditToken( self::$salt );
+return $user->getEditToken( self::$salt );
 }
 
 public static function injectTokenFunction( &$list ) {
diff --git a/api/ApiHardMessages.php b/api/ApiHardMessages.php
index db7b4eb..20b2ea6 100644
--- a/api/ApiHardMessages.php
+++ b/api/ApiHardMessages.php
< at >< at > -162,12 +162,12 < at >< at >
 }
 
 public static function getToken() {
-global $wgUser;
-if ( !$wgUser->isAllowed( self::$right ) ) {
+$user = RequestContext::getMain()->getUser();
+if ( !$user->isAllowed( self::$right ) ) {
 return false;
 }
 
-return $wgUser->getEditToken();
+return $user->getEditToken();
 }
 
 public static function injectTokenFunction( &$list ) {
diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 995e6e6..833b0fa 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
< at >< at > -138,10 +138,9 < at >< at >
 }
 
 public static function getToken() {
-global $wgUser;
-
 // Who designed this?!?!?!
-return $wgUser->getEditToken( 'sandbox' );
+$user = RequestContext::getMain()->getUser();
+return $user->getEditToken( 'sandbox' );
 }
 
 public function getAllowedParams() {
diff --git a/api/ApiTranslationReview.php b/api/ApiTranslationReview.php
index 62be3d7..226b018 100644
--- a/api/ApiTranslationReview.php
+++ b/api/ApiTranslationReview.php
< at >< at > -194,12 +194,12 < at >< at >
 }
 
 public static function getToken() {
-global $wgUser;
-if ( !$wgUser->isAllowed( self::$right ) ) {
+$user = RequestContext::getMain()->getUser();
+if ( !$user->isAllowed( self::$right ) ) {
 return false;
 }
 
-return $wgUser->getEditToken( self::$salt );
+return $user->getEditToken( self::$salt );
 }
 
 public static function injectTokenFunction( &$list ) {
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index 741de68..d3ba150 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
< at >< at > -262,8 +262,6 < at >< at >
 }
 
 public function output() {
-global $wgRequest;
-
 $colspan = array( 'colspan' => 3 );
 
 $s = Xml::openElement( 'table', $this->tableAttributes );
< at >< at > -304,8 +302,9 < at >< at >
 }
 }
 
-global $wgUser;
-if ( $wgUser->isAllowed( 'translate' ) ) {
+$context = RequestContext::getMain();
+
+if ( $context->getUser()->isAllowed( 'translate' ) ) {
 $s .= '<tr>' . Xml::tags( 'td', $colspan, $this->getButtons() ) . '<tr>';
 }
 
< at >< at > -313,7 +312,10 < at >< at >
 
 return Xml::tags(
 'form',
-array( 'method' => 'post', 'action' => $wgRequest->getRequestURL() ),
+array(
+'method' => 'post',
+'action' => $context->getRequest()->getRequestURL()
+),
 $s
 );
 }
diff --git a/scripts/createCheckIndex.php b/scripts/createCheckIndex.php
index f4dc6c4..cec5813 100644
--- a/scripts/createCheckIndex.php
+++ b/scripts/createCheckIndex.php
< at >< at > -68,6 +68,8 < at >< at >
 $collection->resetForNewLanguage( $code );
 $collection->loadTranslations();
 
+global $wgContLang;
+
 foreach ( $collection as $key => $message ) {
 $prob = $checker->checkMessageFast( $message, $code );
 if ( $prob ) {
diff --git a/scripts/fuzzy.php b/scripts/fuzzy.php
index c42563b..e267148 100644
--- a/scripts/fuzzy.php
+++ b/scripts/fuzzy.php
< at >< at > -171,10 +171,11 < at >< at >
  * < at >param string $comment Edit summary.
  */
 private function updateMessage( $title, $text, $dryrun, $comment = null ) {
-global $wgTranslateDocumentationLanguageCode, $wgUser;
+global $wgTranslateDocumentationLanguageCode;
 
-$oldUser = $wgUser;
-$wgUser = FuzzyBot::getUser();
+$context = RequestContext::getMain();
+$oldUser = $context->getUser();
+$context->setUser( FuzzyBot::getUser() );
 
 STDOUT( "Updating {$title->getPrefixedText()}... ", $title );
 if ( !$title instanceof Title ) {
< at >< at > -203,6 +204,6 < at >< at >
 $success = $status === true || ( is_object( $status ) && $status->isOK() );
 STDOUT( $success ? 'OK' : 'FAILED', $title );
 
-$wgUser = $oldUser;
+$context->setUser( $oldUser );
 }
 }
diff --git a/scripts/sync-group.php b/scripts/sync-group.php
index 26becf7..1bce00e 100644
--- a/scripts/sync-group.php
+++ b/scripts/sync-group.php
< at >< at > -267,15 +267,15 < at >< at >
 
 STDOUT( "Conflict in " . $this->color( 'bold', $page ) . "!", $page );
 
-global $wgLang;
 $iso = 'xnY-xnm-xnd"T"xnH:xni:xns';
+$lang = RequestContext::getMain()->getLanguage();
 
 // Finally all is ok, now lets start comparing timestamps
 // Make sure we are comparing timestamps in same format
 $wikiTs = $this->getLastGoodChange( $title, $startTs );
 if ( $wikiTs ) {
 $wikiTs = wfTimestamp( TS_UNIX, $wikiTs );
-$wikiDate = $wgLang->sprintfDate( $iso, wfTimestamp( TS_MW, $wikiTs ) );
+$wikiDate = $lang->sprintfDate( $iso, wfTimestamp( TS_MW, $wikiTs ) );
 } else {
 $wikiDate = 'Unknown';
 }
< at >< at > -289,7 +289,7 < at >< at >
 }
 if ( $changeTs ) {
 $changeTs = wfTimestamp( TS_UNIX, $changeTs );
-$changeDate = $wgLang->sprintfDate( $iso, wfTimestamp( TS_MW, $changeTs ) );
+$changeDate = $lang->sprintfDate( $iso, wfTimestamp( TS_MW, $changeTs ) );
 } else {
 $changeDate = 'Unknown';
 }
< at >< at > -392,10 +392,9 < at >< at >
  * < at >param $comment \string Edit summary.
  */
 public function import( $title, $translation, $comment ) {
-global $wgUser;
-
-$old = $wgUser;
-$wgUser = FuzzyBot::getUser();
+$context = RequestContext::getMain();
+$oldUser = $context->getUser();
+$context->setUser( FuzzyBot::getUser() );
 
 $flags = EDIT_FORCE_BOT;
 if ( $this->norc ) {
< at >< at > -408,7 +407,7 < at >< at >
 $success = $status === true || ( is_object( $status ) && $status->isOK() );
 STDOUT( $success ? 'OK' : 'FAILED', $title );
 
-$wgUser = $old;
+$context->setUser( $oldUser );
 }
 }
 
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 871a23a..0440eca 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
< at >< at > -559,13 +559,14 < at >< at >
 protected function tuxLanguageSelector() {
 // Changes here must also be reflected when the language
 // changes on the client side
-global $wgLang, $wgTranslateDocumentationLanguageCode;
+global $wgTranslateDocumentationLanguageCode;
 
 if ( $this->options['language'] === $wgTranslateDocumentationLanguageCode ) {
 // The name will be displayed in the UI language,
 // so use for lang and dir
-$targetLangCode = $wgLang->getCode();
-$targetLangDir = $wgLang->getDir();
+$lang = RequestContext::getMain()->getLanguage();
+$targetLangCode = $lang->getCode();
+$targetLangDir = $lang->getDir();
 $targetLangName = $this->msg( 'translate-documentation-language' )->text();
 } else {
 $targetLangCode = $this->options['language'];
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 13c5567..506525d 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
< at >< at > -660,7 +660,7 < at >< at >
 }
 
 protected static function sourcePageHeader( Title $title ) {
-global $wgUser, $wgLang;
+$context = RequestContext::getMain();
 
 $page = TranslatablePage::newFromTitle( $title );
 
< at >< at > -674,15 +674,15 < at >< at >
 
 $actions = array();
 
-if ( $marked && $wgUser->isAllowed( 'translate' ) ) {
+if ( $marked && $context->getUser()->isAllowed( 'translate' ) ) {
 $par = array(
 'group' => $page->getMessageGroupId(),
-'language' => $wgLang->getCode(),
+'language' => $context->getLanguage()->getCode(),
 'task' => 'view'
 );
 
 $translate = SpecialPage::getTitleFor( 'Translate' );
-$linkDesc = wfMessage( 'translate-tag-translate-link-desc' )->escaped();
+$linkDesc = $context->msg( 'translate-tag-translate-link-desc' )->escaped();
 $actions[] = Linker::link( $translate, $linkDesc, array(), $par );
 }
 
< at >< at > -691,18 +691,18 < at >< at >
 $par = array( 'target' => $title->getPrefixedText() );
 $translate = SpecialPage::getTitleFor( 'PageTranslation' );
 
-if ( $wgUser->isAllowed( 'pagetranslation' ) ) {
+if ( $context->getUser()->isAllowed( 'pagetranslation' ) ) {
 // This page has never been marked
 if ( $marked === false ) {
-$linkDesc = wfMessage( 'translate-tag-markthis' )->escaped();
+$linkDesc = $context->msg( 'translate-tag-markthis' )->escaped();
 $actions[] = Linker::link( $translate, $linkDesc, array(), $par );
 } else {
 $markUrl = $translate->getFullUrl( $par );
-$actions[] = wfMessage( 'translate-tag-markthisagain', $diffUrl, $markUrl )
+$actions[] = $context->msg( 'translate-tag-markthisagain', $diffUrl, $markUrl )
 ->parse();
 }
 } else {
-$actions[] = wfMessage( 'translate-tag-hasnew', $diffUrl )->parse();
+$actions[] = $context->msg( 'translate-tag-hasnew', $diffUrl )->parse();
 }
 }
 
< at >< at > -713,17 +713,13 < at >< at >
 $legend = Html::rawElement(
 'div',
 array( 'class' => 'mw-pt-translate-header noprint nomobile' ),
-$wgLang->semicolonList( $actions )
+$context->getLanguage()->semicolonList( $actions )
 ) . Html::element( 'hr' );
 
-global $wgOut;
-
-$wgOut->addHTML( $legend );
+$context->getOutput()->addHTML( $legend );
 }
 
 protected static function translationPageHeader( Title $title ) {
-global $wgOut;
-
 if ( !$title->exists() ) {
 return;
 }
< at >< at > -747,9 +743,10 < at >< at >
 
 // Output
 $wrap = '<div class="mw-translate-page-info">$1</div>';
-$wgOut->wrapWikiMsg( $wrap, array( 'tpt-translation-intro', $url, $titleText, $per ) );
+$out = RequestContext::getMain()->getOutput();
 
-$wgOut->addHTML( '<hr />' );
+$out->wrapWikiMsg( $wrap, array( 'tpt-translation-intro', $url, $titleText, $per ) );
+$out->addHTML( '<hr />' );
 }
 
 /// Hook: SpecialPage_initList
< at >< at > -780,10 +777,9 < at >< at >
 
 /// Hook: SkinSubPageSubtitle
 public static function replaceSubtitle( &$subpages, $skin = null, $out = null ) {
-global $wgOut;
 // $out was only added in some MW version
 if ( $out === null ) {
-$out = $wgOut;
+$out = RequestContext::getMain()->getOutput();
 }
 
 if ( !TranslatablePage::isTranslationPage( $out->getTitle() )
diff --git a/tag/TranslateDeleteJob.php b/tag/TranslateDeleteJob.php
index 5659ae7..4383b57 100644
--- a/tag/TranslateDeleteJob.php
+++ b/tag/TranslateDeleteJob.php
< at >< at > -39,9 +39,8 < at >< at >
 }
 
 function run() {
-global $wgUser;
-
 // Initialization
+$context = RequestContext::getMain();
 $title = $this->title;
 // Other stuff
 $user = $this->getUser();
< at >< at > -50,8 +49,8 < at >< at >
 $doer = User::newFromName( $this->getPerformer() );
 
 PageTranslationHooks::$allowTargetEdit = true;
-$oldUser = $wgUser;
-$wgUser = $user;
+$oldUser = $context->getUser();
+$context->setUser( $user );
 
 $error = '';
 $article = new Article( $title, 0 );
< at >< at > -94,7 +93,7 < at >< at >
 $title->invalidateCache();
 }
 
-$wgUser = $oldUser;
+$context->setUser( $oldUser );
 
 return true;
 }
diff --git a/tag/TranslateMoveJob.php b/tag/TranslateMoveJob.php
index 18b80c6..55d027c 100644
--- a/tag/TranslateMoveJob.php
+++ b/tag/TranslateMoveJob.php
< at >< at > -43,9 +43,8 < at >< at >
 }
 
 function run() {
-global $wgUser;
-
 // Initialization
+$context = RequestContext::getMain();
 $title = $this->title;
 // Other stuff
 $user = $this->getUser();
< at >< at > -55,8 +54,8 < at >< at >
 $doer = User::newFromName( $this->getPerformer() );
 
 PageTranslationHooks::$allowTargetEdit = true;
-$oldUser = $wgUser;
-$wgUser = $user;
+$oldUser = $context->getUser();
+$context->setUser( $user );
 self::forceRedirects( false );
 
 // Don't check perms, don't leave a redirect
< at >< at > -101,7 +100,7 < at >< at >
 $entry->publish( $logid );
 }
 
-$wgUser = $oldUser;
+$context->setUser( $oldUser );
 
 return true;
 }
< at >< at > -181,7 +180,6 < at >< at >
 static $originalLevel = null;
 
 global $wgGroupPermissions;
-global $wgUser;
 
 if ( $end ) {
 if ( $suppressCount ) {
< at >< at > -203,6 +201,7 < at >< at >
 }
 ++$suppressCount;
 }
-$wgUser->clearInstanceCache();
+
+RequestContext::getMain()->getUser()->clearInstanceCache();
 }
 }
diff --git a/tests/api/ApiTokensTest.php b/tests/api/ApiTokensTest.php
index fc1b32e..74688fa 100644
--- a/tests/api/ApiTokensTest.php
+++ b/tests/api/ApiTokensTest.php
< at >< at > -15,9 +15,9 < at >< at >
 /** < at >dataProvider provideTokenClasses */
 public function testTokenRetrieval( $id, $class ) {
 // Make sure we have the right to get the token
-global $wgGroupPermissions, $wgUser;
+global $wgGroupPermissions;
 $wgGroupPermissions['*'][$class::getRight()] = true;
-$wgUser->clearInstanceCache(); // Reread above global
+RequestContext::getMain()->getUser()->clearInstanceCache(); // Reread above global
 
 // We should be getting anonymous user token
 $expected = $class::getToken();
diff --git a/utils/JsSelectToInput.php b/utils/JsSelectToInput.php
index 0267cd8..fda586b 100644
--- a/utils/JsSelectToInput.php
+++ b/utils/JsSelectToInput.php
< at >< at > -123,7 +123,6 < at >< at >
 return;
 }
 
-global $wgOut;
-$wgOut->addModules( 'ext.translate.selecttoinput' );
+RequestContext::getMain()->getOutput()->addModules( 'ext.translate.selecttoinput' );
 }
 }
diff --git a/utils/MessageTable.php b/utils/MessageTable.php
index 52ef86b..324c9bb 100644
--- a/utils/MessageTable.php
+++ b/utils/MessageTable.php
< at >< at > -108,9 +108,9 < at >< at >
 }
 
 public function includeAssets() {
-global $wgOut;
+$out = RequestContext::getMain()->getOutput();
 
-TranslationHelpers::addModules( $wgOut );
+TranslationHelpers::addModules( $out );
 $pages = array();
 
 foreach ( $this->collection->getTitles() as $title ) {
< at >< at > -118,7 +118,7 < at >< at >
 }
 
 $vars = array( 'trlKeys' => $pages );
-$wgOut->addScript( Skin::makeVariablesScript( $vars ) );
+$out->addScript( Skin::makeVariablesScript( $vars ) );
 }
 
 public function header() {
< at >< at > -149,7 +149,8 < at >< at >
 }
 
 public function contents() {
-$optional = wfMessage( 'translate-optional' )->escaped();
+$context = RequestContext::getMain();
+$optional = $context->msg( 'translate-optional' )->escaped();
 
 $this->doLinkBatch();
 
< at >< at > -192,8 +193,10 < at >< at >
 // Using Html::element( a ) because Linker::link is memory hog.
 // It takes about 20 KiB per call, and that times 5000 is quite
 // a lot of memory.
-global $wgLang;
-$niceTitle = htmlspecialchars( $wgLang->truncate( $title->getPrefixedText(), -35 ) );
+$niceTitle = htmlspecialchars( $context->getLanguage()->truncate(
+$title->getPrefixedText(),
+-35
+) );
 $linkAttribs = array(
 'href' => $title->getLocalUrl( array( 'action' => 'edit' ) + $this->editLinkParams ),
 );
< at >< at > -289,11 +292,10 < at >< at >
 }
 
 protected function getReviewButton( TMessage $message ) {
-global $wgUser;
-
 $revision = $message->getProperty( 'revision' );
+$user = RequestContext::getMain()->getUser();
 
-if ( !$this->reviewMode || !$wgUser->isAllowed( 'translate-messagereview' ) || !$revision ) {
+if ( !$this->reviewMode || !$user->isAllowed( 'translate-messagereview' ) || !$revision ) {
 return '';
 }
 
< at >< at > -306,7 +308,7 < at >< at >
 );
 
 $reviewers = (array)$message->getProperty( 'reviewers' );
-if ( in_array( $wgUser->getId(), $reviewers ) ) {
+if ( in_array( $user->getId(), $reviewers ) ) {
 $attribs['value'] = wfMessage( 'translate-messagereview-done' )->text();
 $attribs['disabled'] = 'disabled';
 $attribs['title'] = wfMessage( 'translate-messagereview-doit' )->text();
< at >< at > -314,7 +316,7 < at >< at >
 $attribs['value'] = wfMessage( 'translate-messagereview-submit' )->text();
 $attribs['disabled'] = 'disabled';
 $attribs['title'] = wfMessage( 'translate-messagereview-no-fuzzy' )->text();
-} elseif ( $wgUser->getName() === $message->getProperty( 'last-translator-text' ) ) {
+} elseif ( $user->getName() === $message->getProperty( 'last-translator-text' ) ) {
 $attribs['value'] = wfMessage( 'translate-messagereview-submit' )->text();
 $attribs['disabled'] = 'disabled';
 $attribs['title'] = wfMessage( 'translate-messagereview-no-own' )->text();
< at >< at > -331,8 +333,6 < at >< at >
 protected $reviewStatusCache = array();
 
 protected function getReviewStatus( TMessage $message ) {
-global $wgUser;
-
 if ( !$this->reviewMode ) {
 return '';
 }
< at >< at > -344,7 +344,8 < at >< at >
 return '';
 }
 
-$you = in_array( $wgUser->getId(), $reviewers );
+$userId = RequestContext::getMain()->getUser()->getId();
+$you = in_array( $userId, $reviewers );
 $key = $you ? "y$count" : "n$count";
 
 // ->text() (and ->parse()) invokes the parser. Each call takes
diff --git a/utils/MessageWebImporter.php b/utils/MessageWebImporter.php
index da80029..8b35f02 100644
--- a/utils/MessageWebImporter.php
+++ b/utils/MessageWebImporter.php
< at >< at > -61,10 +61,11 < at >< at >
 $this->title = $title;
 }
 
+/**
+ * < at >return User
+ */
 public function getUser() {
-global $wgUser;
-
-return $this->user ? $this->user : $wgUser;
+return $this->user ? $this->user : RequestContext::getMain()->getUser();
 }
 
 public function setUser( User $user ) {
< at >< at > -133,11 +134,11 < at >< at >
  * < at >return bool
  */
 protected function allowProcess() {
-global $wgRequest;
+$request = RequestContext::getMain()->getRequest();
 
-if ( $wgRequest->wasPosted() &&
-$wgRequest->getBool( 'process', false ) &&
-$this->getUser()->matchEditToken( $wgRequest->getVal( 'token' ) )
+if ( $request->wasPosted() &&
+$request->getBool( 'process', false ) &&
+$this->getUser()->matchEditToken( $request->getVal( 'token' ) )
 ) {
 
 return true;
< at >< at > -171,9 +172,8 < at >< at >
 }
 
 public function execute( $messages ) {
-global $wgOut, $wgLang;
-
-$this->out = $wgOut;
+$context = RequestContext::getMain();
+$this->out = $context->getOutput();
 
 // Set up diff engine
 $diff = new DifferenceEngine;
< at >< at > -209,7 +209,8 < at >< at >
 
 if ( $old === false ) {
 $para = '<code class="mw-tmi-new">' . htmlspecialchars( $key ) . '</code>';
-$name = wfMessage( 'translate-manage-import-new' )->rawParams( $para )->escaped();
+$name = $context->msg( 'translate-manage-import-new' )->rawParams( $para )
+->escaped();
 $text = TranslateUtils::convertWhiteSpaceToHTML( $value );
 $changed[] = self::makeSectionElement( $name, 'new', $text );
 } else {
< at >< at > -217,8 +218,8 < at >< at >
 $text = $diff->getDiff( '', '' );
 $type = 'changed';
 
-global $wgRequest;
-$action = $wgRequest->getVal( self::escapeNameForPHP( "action-$type-$key" ) );
+$action = $context->getRequest()
+->getVal( self::escapeNameForPHP( "action-$type-$key" ) );
 
 if ( $process ) {
 if ( !count( $changed ) ) {
< at >< at > -226,9 +227,10 < at >< at >
 }
 
 if ( $action === null ) {
-$message = wfMessage(
+$message = $context->msg(
 'translate-manage-inconsistent',
-wfEscapeWikiText( "action-$type-$key" ) )->parse();
+wfEscapeWikiText( "action-$type-$key" )
+)->parse();
 $changed[] = "<li>$message</li></ul>";
 $process = false;
 } else {
< at >< at > -247,13 +249,13 < at >< at >
 
 $key = array_shift( $message );
 $params = $message;
-$message = wfMessage( $key, $params )->parse();
+$message = $context->msg( $key, $params )->parse();
 $changed[] = "<li>$message</li>";
 
 if ( $this->checkProcessTime() ) {
 $process = false;
-$message = wfMessage(
-'translate-manage-toolong' )->numParams( $this->processingTime )->parse();
+$message = $context->msg( 'translate-manage-toolong' )
+->numParams( $this->processingTime )->parse();
 $changed[] = "<li>$message</li></ul>";
 }
 continue;
< at >< at > -271,14 +273,14 < at >< at >
 // translate-manage-action-import, translate-manage-action-conflict,
 // translate-manage-action-ignore, translate-manage-action-fuzzy
 foreach ( $actions as $action ) {
-$label = wfMessage( "translate-manage-action-$action" )->text();
+$label = $context->msg( "translate-manage-action-$action" )->text();
 $name = self::escapeNameForPHP( "action-$type-$key" );
 $id = Sanitizer::escapeId( "action-$key-$action" );
 $act[] = Xml::radioLabel( $label, $name, $action, $id, $action === $defaction );
 }
 
 $param = '<code class="mw-tmi-diff">' . htmlspecialchars( $key ) . '</code>';
-$name = wfMessage( 'translate-manage-import-diff', $param,
+$name = $context->msg( 'translate-manage-import-diff', $param,
 implode( ' ', $act )
 )->text();
 
< at >< at > -294,7 +296,7 < at >< at >
 
 foreach ( $diff as $s ) {
 $para = '<code class="mw-tmi-deleted">' . htmlspecialchars( $s ) . '</code>';
-$name = wfMessage( 'translate-manage-import-deleted' )->rawParams( $para )->escaped();
+$name = $context->msg( 'translate-manage-import-deleted' )->rawParams( $para )->escaped();
 $text = TranslateUtils::convertWhiteSpaceToHTML( $collection[$s]->translation() );
 $changed[] = self::makeSectionElement( $name, 'deleted', $text );
 }
< at >< at > -309,7 +311,7 < at >< at >
 $changed[] = '<ul>';
 }
 
-$message = wfMessage( 'translate-manage-import-done' )->parse();
+$message = $context->msg( 'translate-manage-import-done' )->parse();
 $changed[] = "<li>$message</li></ul>";
 $this->out->addHTML( implode( "\n", $changed ) );
 } else {
< at >< at > -318,12 +320,15 < at >< at >
 if ( $code === 'en' ) {
 $this->out->addWikiMsg( 'translate-manage-intro-en' );
 } else {
-$lang = TranslateUtils::getLanguageName( $code, $wgLang->getCode() );
+$lang = TranslateUtils::getLanguageName(
+$code,
+$context->getLanguage()->getCode()
+);
 $this->out->addWikiMsg( 'translate-manage-intro-other', $lang );
 }
 $this->out->addHTML( Html::hidden( 'language', $code ) );
 $this->out->addHTML( implode( "\n", $changed ) );
-$this->out->addHTML( Xml::submitButton( wfMessage( 'translate-manage-submit' )->text() ) );
+$this->out->addHTML( Xml::submitButton( $context->msg( 'translate-manage-submit' )->text() ) );
 } else {
 $this->out->addWikiMsg( 'translate-manage-nochanges' );
 }
< at >< at > -343,7 +348,7 < at >< at >
  * < at >param string $code Language code
  * < at >param string $message Contents for the $key/code combination
  * < at >param string $comment Edit summary (default: empty) - see Article::doEdit
- * < at >param User $user User that will make the edit (default: null - $wgUser).
+ * < at >param User $user User that will make the edit (default: null - RequestContext user).
  *        See Article::doEdit.
  * < at >param int $editFlags Integer bitfield: see Article::doEdit
  * < at >throws MWException
< at >< at > -420,10 +425,10 < at >< at >
  * < at >return array|String
  */
 public static function doFuzzy( $title, $message, $comment, $user, $editFlags = 0 ) {
-global $wgUser;
+$context = RequestContext::getMain();
 
-if ( !$wgUser->isAllowed( 'translate-manage' ) ) {
-return wfMessage( 'badaccess-group0' )->text();
+if ( !$context->getUser()->isAllowed( 'translate-manage' ) ) {
+return $context->msg( 'badaccess-group0' )->text();
 }
 
 $dbw = wfGetDB( DB_MASTER );
< at >< at > -483,7 +488,7 < at >< at >
 $text = '';
 foreach ( $changed as $c ) {
 $key = array_shift( $c );
-$text .= "* " . wfMessage( $key, $c )->plain() . "\n";
+$text .= "* " . $context->msg( $key, $c )->plain() . "\n";
 }
 
 return array( 'translate-manage-import-fuzzy', "\n" . $text );
diff --git a/utils/RcFilter.php b/utils/RcFilter.php
index 6998e65..67889fb 100644
--- a/utils/RcFilter.php
+++ b/utils/RcFilter.php
< at >< at > -26,9 +26,10 < at >< at >
  * < at >return bool true
  */
 public static function translationFilter( &$conds, &$tables, &$join_conds, $opts ) {
-global $wgRequest, $wgTranslateMessageNamespaces, $wgTranslateRcFilterDefault;
+global $wgTranslateMessageNamespaces, $wgTranslateRcFilterDefault;
 
-$translations = $wgRequest->getVal( 'translations', $wgTranslateRcFilterDefault );
+$request = RequestContext::getMain()->getRequest();
+$translations = $request->getVal( 'translations', $wgTranslateRcFilterDefault );
 $opts->add( 'translations', $wgTranslateRcFilterDefault );
 $opts->setValue( 'translations', $translations );
 
diff --git a/utils/StatsTable.php b/utils/StatsTable.php
index 30fdd6c..065bff3 100644
--- a/utils/StatsTable.php
+++ b/utils/StatsTable.php
< at >< at > -31,9 +31,7 < at >< at >
 protected $extraColumns = array();
 
 public function __construct() {
-global $wgLang;
-
-$this->lang = $wgLang;
+$this->lang = RequestContext::getMain()->getLanguage();
 $this->translate = SpecialPage::getTitleFor( 'Translate' );
 }
 
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index c8d0b58..7b10e32 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
< at >< at > -66,12 +66,14 < at >< at >
  * disabled all other output.
  */
 public function execute() {
-global $wgOut, $wgServer, $wgScriptPath, $wgUser, $wgRequest;
+global $wgServer, $wgScriptPath;
 
-$wgOut->disable();
+$context = RequestContext::getMain();
+
+$context->getOutput()->disable();
 
 $data = $this->getEditInfo();
-$groupId = $wgRequest->getText( 'loadgroup', '' );
+$groupId = $context->getRequest()->getText( 'loadgroup', '' );
 $helpers = new TranslationHelpers( $this->getTitle(), $groupId );
 
 $id = "tm-target-{$helpers->dialogID()}";
< at >< at > -108,7 +110,7 < at >< at >
 'dir' => $targetLang->getDir(),
 );
 
-if ( !$groupId || !$wgUser->isAllowed( 'translate' ) ) {
+if ( !$groupId || !$context->getUser()->isAllowed( 'translate' ) ) {
 $textareaParams['readonly'] = 'readonly';
 }
 
< at >< at > -132,23 +134,23 < at >< at >
 $hidden[] = Html::hidden( 'action', 'edit' );
 
 $summary = Xml::inputLabel(
-wfMessage( 'translate-js-summary' )->text(),
+$context->msg( 'translate-js-summary' )->text(),
 'summary',
 'summary',
 40
 );
 $save = Xml::submitButton(
-wfMessage( 'translate-js-save' )->text(),
+$context->msg( 'translate-js-save' )->text(),
 array( 'class' => 'mw-translate-save' )
 );
 $saveAndNext = Xml::submitButton(
-wfMessage( 'translate-js-next' )->text(),
+$context->msg( 'translate-js-next' )->text(),
 array( 'class' => 'mw-translate-next' )
 );
 $skip = Html::element( 'input', array(
 'class' => 'mw-translate-skip',
 'type' => 'button',
-'value' => wfMessage( 'translate-js-skip' )->text()
+'value' => $context->msg( 'translate-js-skip' )->text()
 ) );
 
 if ( $this->getTitle()->exists() ) {
< at >< at > -157,7 +159,7 < at >< at >
 array(
 'class' => 'mw-translate-history',
 'type' => 'button',
-'value' => wfMessage( 'translate-js-history' )->text()
+'value' => $context->msg( 'translate-js-history' )->text()
 )
 );
 } else {
< at >< at > -166,10 +168,10 < at >< at >
 
 $support = $this->getSupportButton( $this->getTitle() );
 
-if ( $wgUser->isAllowed( 'translate' ) ) {
+if ( $context->getUser()->isAllowed( 'translate' ) ) {
 $bottom = "$summary$save$saveAndNext$skip$history$support";
 } else {
-$text = wfMessage( 'translate-edit-nopermission' )->escaped();
+$text = $context->msg( 'translate-edit-nopermission' )->escaped();
 $button = $this->getPermissionPageButton();
 $bottom = "$text $button$skip$history$support";
 }
< at >< at > -234,9 +236,9 < at >< at >
  * < at >return \array
  */
 public static function jsEdit( Title $title, $group = "", $type = 'default' ) {
-global $wgUser;
+$context = RequestContext::getMain();
 
-if ( !$wgUser->getOption( 'translate-jsedit' ) ) {
+if ( !$context->getUser()->getOption( 'translate-jsedit' ) ) {
 return array();
 }
 
< at >< at > -251,7 +253,7 < at >< at >
 
 return array(
 'onclick' => $onclick,
-'title' => wfMessage( 'translate-edit-title', $title->getPrefixedText() )->text()
+'title' => $context->msg( 'translate-edit-title', $title->getPrefixedText() )->text()
 );
 }
 
diff --git a/utils/TranslationHelpers.php b/utils/TranslationHelpers.php
index bb69cf0..002da3a 100644
--- a/utils/TranslationHelpers.php
+++ b/utils/TranslationHelpers.php
< at >< at > -187,8 +187,8 < at >< at >
 array( 'lazy' )
 );
 } elseif ( $suggestions === 'checks' ) {
-global $wgRequest;
-$this->translation = $wgRequest->getText( 'translation' );
+$request = RequestContext::getMain()->getRequest();
+$this->translation = $request->getText( 'translation' );
 
 return (string)$this->callBox( 'check', $all['check'] );
 }
< at >< at > -477,9 +477,10 < at >< at >
 }
 
 protected static function makeGoogleQueryParams( $definition, $pair, $config ) {
-global $wgSitename, $wgVersion, $wgProxyKey, $wgUser;
+global $wgSitename, $wgVersion, $wgProxyKey;
 
 $app = "$wgSitename (MediaWiki $wgVersion; Translate " . TRANSLATE_VERSION . ")";
+$context = RequestContext::getMain();
 $options = array();
 $options['timeout'] = $config['timeout'];
 
< at >< at > -488,7 +489,7 < at >< at >
 'v' => '1.0',
 'langpair' => $pair,
 // Unique but not identifiable
-'userip' => sha1( $wgProxyKey . $wgUser->getName() ),
+'userip' => sha1( $wgProxyKey . $context->getUser()->getName() ),
 'x-application' => $app,
 );
 
< at >< at > -843,12 +844,13 < at >< at >
 public function getCheckBox() {
 $this->mustBeKnownMessage();
 
-global $wgTranslateDocumentationLanguageCode, $wgRequest, $wgOut;
+global $wgTranslateDocumentationLanguageCode;
 
-$title = $wgOut->getTitle();
+$context = RequestContext::getMain();
+$title = $context->getOutput()->getTitle();
 list( $alias, ) = SpecialPageFactory::resolveAlias( $title->getText() );
 
-$tux = SpecialTranslate::isBeta( $wgRequest )
+$tux = SpecialTranslate::isBeta( $context->getRequest() )
 && $title->isSpecialPage()
 && ( $alias === 'Translate' );
 
< at >< at > -887,25 +889,27 < at >< at >
 
 foreach ( $checks as $checkParams ) {
 $key = array_shift( $checkParams );
-$checkMessages[] = wfMessage( $key, $checkParams )->parse();
+$checkMessages[] = $context->msg( $key, $checkParams )->parse();
 }
 
 if ( $tux ) {
 $formattedChecks = FormatJson::encode( $checkMessages );
 } else {
-$formattedChecks = Html::rawElement( 'div', array( 'class' => 'mw-translate-messagechecks' ),
+$formattedChecks = Html::rawElement(
+'div',
+array( 'class' => 'mw-translate-messagechecks' ),
 TranslateUtils::fieldset(
-wfMessage( 'translate-edit-warnings' )->escaped(), implode( '<hr />', $checkMessages ),
+$context->msg( 'translate-edit-warnings' )->escaped(),
+implode( '<hr />', $checkMessages ),
 array( 'class' => 'mw-sp-translate-edit-warnings' )
-) );
+)
+);
 }
 
 return $formattedChecks;
 }
 
 public function getOtherLanguagesBox() {
-global $wgLang;
-
 $code = $this->handle->getCode();
 $page = $this->handle->getKey();
 $ns = $this->handle->getTitle()->getNamespace();
< at >< at > -917,10 +921,10 < at >< at >
 continue;
 }
 
-$label =
-TranslateUtils::getLanguageName( $fbcode, $wgLang->getCode() ) .
-wfMessage( 'word-separator' )->text() .
-wfMessage( 'parentheses', wfBCP47( $fbcode ) )->text();
+$context = RequestContext::getMain();
+$label = TranslateUtils::getLanguageName( $fbcode, $context->getLanguage()->getCode() ) .
+$context->msg( 'word-separator' )->text() .
+$context->msg( 'parentheses', wfBCP47( $fbcode ) )->text();
 
 $target = Title::makeTitleSafe( $ns, "$page/$fbcode" );
 if ( $target ) {
< at >< at > -967,17 +971,21 < at >< at >
 }
 
 public function getDocumentationBox() {
-global $wgTranslateDocumentationLanguageCode, $wgOut;
+global $wgTranslateDocumentationLanguageCode;
 
 if ( !$wgTranslateDocumentationLanguageCode ) {
 throw new TranslationHelperException( 'Message documentation language code is not defined' );
 }
 
+$context = RequestContext::getMain();
 $page = $this->handle->getKey();
 $ns = $this->handle->getTitle()->getNamespace();
 
 $title = Title::makeTitle( $ns, $page . '/' . $wgTranslateDocumentationLanguageCode );
-$edit = self::ajaxEditLink( $title, wfMessage( 'translate-edit-contribute' )->escaped() );
+$edit = self::ajaxEditLink(
+$title,
+$context->msg( 'translate-edit-contribute' )->escaped()
+);
 $info = TranslateUtils::getMessageContent( $page, $wgTranslateDocumentationLanguageCode, $ns );
 
 $class = 'mw-sp-translate-edit-info';
< at >< at > -992,20 +1000,20 < at >< at >
 $divAttribs = array( 'dir' => 'ltr', 'lang' => 'en', 'class' => 'mw-content-ltr' );
 
 if ( strval( $info ) === '' ) {
-global $wgLang;
-$info = wfMessage( 'translate-edit-no-information' )->text();
+$info = $context->msg( 'translate-edit-no-information' )->text();
 $class = 'mw-sp-translate-edit-noinfo';
+$lang = $context->getLanguage();
 // The message saying that there's no info, should be translated
-$divAttribs = array( 'dir' => $wgLang->getDir(), 'lang' => $wgLang->getCode() );
+$divAttribs = array( 'dir' => $lang->getDir(), 'lang' => $lang->getCode() );
 }
 $class .= ' mw-sp-translate-message-documentation';
 
-$contents = $wgOut->parse( $info );
+$contents = $context->getOutput()->parse( $info );
 // Remove whatever block element wrapup the parser likes to add
 $contents = preg_replace( '~^<([a-z]+)>(.*)</\1>$~us', '\2', $contents );
 
 return TranslateUtils::fieldset(
-wfMessage( 'translate-edit-information' )->rawParams( $edit )->escaped(),
+$context->msg( 'translate-edit-information' )->rawParams( $edit )->escaped(),
 Html::rawElement( 'div', $divAttribs, $contents ), array( 'class' => $class )
 );
 }
< at >< at > -1146,21 +1154,21 < at >< at >
 return null;
 }
 
-global $wgUser;
-$user = $latestRev->getUserText( Revision::FOR_THIS_USER, $wgUser );
+$context = RequestContext::getMain();
+$user = $latestRev->getUserText( Revision::FOR_THIS_USER, $context->getUser() );
 $comment = $latestRev->getComment();
 
 if ( $diffText === '' ) {
 if ( strval( $comment ) !== '' ) {
-$text = wfMessage( 'translate-dynagroup-byc', $user, $comment )->escaped();
+$text = $context->msg( 'translate-dynagroup-byc', $user, $comment )->escaped();
 } else {
-$text = wfMessage( 'translate-dynagroup-by', $user )->escaped();
+$text = $context->msg( 'translate-dynagroup-by', $user )->escaped();
 }
 } else {
 if ( strval( $comment ) !== '' ) {
-$text = wfMessage( 'translate-dynagroup-lastc', $user, $comment )->escaped();
+$text = $context->msg( 'translate-dynagroup-lastc', $user, $comment )->escaped();
 } else {
-$text = wfMessage( 'translate-dynagroup-last', $user )->escaped();
+$text = $context->msg( 'translate-dynagroup-last', $user )->escaped();
 }
 }
 
< at >< at > -1192,10 +1200,11 < at >< at >
  * < at >return array
  */
 protected static function getFallbacks( $code ) {
-global $wgUser, $wgTranslateLanguageFallbacks;
+global $wgTranslateLanguageFallbacks;
 
 // User preference has the final say
-$preference = $wgUser->getOption( 'translate-editlangs' );
+$user = RequestContext::getMain()->getUser();
+$preference = $user->getOption( 'translate-editlangs' );
 if ( $preference !== 'default' ) {
 $fallbacks = array_map( 'trim', explode( ',', $preference ) );
 foreach ( $fallbacks as $k => $v ) {
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 4ffc2ba..434d1ff 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
< at >< at > -103,10 +103,9 < at >< at >
  * < at >return JsSelectToInput
  */
 protected static function languageSelector() {
-global $wgLang;
-
 if ( is_callable( array( 'LanguageNames', 'getNames' ) ) ) {
-$languages = LanguageNames::getNames( $wgLang->getCode(),
+$lang = RequestContext::getMain()->getLanguage();
+$languages = LanguageNames::getNames( $lang->getCode(),
 LanguageNames::FALLBACK_NORMAL
 );
 } else {

[MediaWiki-commits] [Gerrit] Rename Skin::getUsableSkins() toSkin::getAllowedSkins() - change (mediawiki/core)

Waldir (Code Review — 2013-05-25T13:12:59

Waldir has uploaded a new change for review.

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


Change subject: Rename Skin::getUsableSkins() to Skin::getAllowedSkins()
......................................................................

Rename Skin::getUsableSkins() to Skin::getAllowedSkins()

Follow-up to change 65426 (commit a3c7a8b8f)

Change-Id: I0b0fdfb5615c22aa876882c3ca344ebb1f10c4bd
---
M includes/Preferences.php
M includes/Skin.php
M includes/api/ApiQuerySiteinfo.php
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/46/65446/1

diff --git a/includes/Preferences.php b/includes/Preferences.php
index a6d530f..df80894 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
< at >< at > -1074,9 +1074,8 < at >< at >
 $mptitle = Title::newMainPage();
 $previewtext = $context->msg( 'skin-preview' )->text();
 
-# Only show members of Skin::getSkinNames() rather than
-# $skinNames (skins is all skin names from Language.php)
-$validSkinNames = Skin::getUsableSkins();
+# Only show skins that aren't disabled in $wgSkipSkins
+$validSkinNames = Skin::getAllowedSkins();
 
 # Sort by UI skin name. First though need to update validSkinNames as sometimes
 # the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
diff --git a/includes/Skin.php b/includes/Skin.php
index 15b8545..0bc7c3e 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
< at >< at > -93,7 +93,7 < at >< at >
  * only want to show skins users _can_ use.
  * < at >return array of strings
  */
-public static function getUsableSkins() {
+public static function getAllowedSkins() {
 global $wgSkipSkins;
 
 $allowedSkins = self::getSkinNames();
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 09a0f3d..30d2425 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
< at >< at > -544,12 +544,12 < at >< at >
 
 public function appendSkins( $property ) {
 $data = array();
-$usable = Skin::getUsableSkins();
+$allowed = Skin::getAllowedSkins();
 $default = Skin::normalizeKey( 'default' );
 foreach ( Skin::getSkinNames() as $name => $displayName ) {
 $skin = array( 'code' => $name );
 ApiResult::setContent( $skin, $displayName );
-if ( !isset( $usable[$name] ) ) {
+if ( !isset( $allowed[$name] ) ) {
 $skin['unusable'] = '';
 }
 if ( $name === $default ) {

[MediaWiki-commits] [Gerrit] Point php to 1.22wmf4 - change(operations/mediawiki-config)

Reedy (Code Review — 2013-05-25T13:10:39

Reedy has uploaded a new change for review.

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


Change subject: Point php to 1.22wmf4
......................................................................

Point php to 1.22wmf4

Change-Id: I1a8cbfefabf27d54eac1c361e4c00ac02d7e72ae
---
M php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/php b/php
index 94453d1..82a4545 120000
--- a/php
+++ b/php
< at >< at > -1 +1 < at >< at >
-php-1.22wmf3
\ No newline at end of file
+php-1.22wmf4
\ No newline at end of file

[MediaWiki-commits] [Gerrit] Fix misspelled event handler - change(mediawiki...VisualEditor)

Catrope (Code Review — 2013-05-25T12:53:52

Catrope has uploaded a new change for review.

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


Change subject: Fix misspelled event handler
......................................................................

Fix misspelled event handler

Change-Id: I3f3091aad24d4bfdea08fbce1c331e8767866bbc
---
M modules/ve/ui/widgets/ve.ui.MWCategoryWidget.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve/ui/widgets/ve.ui.MWCategoryWidget.js b/modules/ve/ui/widgets/ve.ui.MWCategoryWidget.js
index 319ca9f..b83ca6d 100644
--- a/modules/ve/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MWCategoryWidget.js
< at >< at > -140,7 +140,7 < at >< at >
  * Toggles popup menu per category item
  * < at >param {Object} item
  */
-ve.ui.MWCategoryWidget.prototype.onTogglePoupupMenu = function ( item ) {
+ve.ui.MWCategoryWidget.prototype.onTogglePopupMenu = function ( item ) {
 // Close open popup.
 if ( this.savedPopupState === false || item.value !== this.popup.category ) {
 this.popup.openPopup( item );
< at >< at > -184,7 +184,7 < at >< at >
 categoryItem = new ve.ui.MWCategoryItemWidget( { '$$': this.$$, 'item': item } );
 categoryItem.connect( this, {
 'savePopupState': 'onSavePopupState',
-'togglePopupMenu': 'onTogglePoupupMenu'
+'togglePopupMenu': 'onTogglePopupMenu'
 } );
 // Auto-remove existing items by value
 if ( item.value in this.categories ) {

[MediaWiki-commits] [Gerrit] add virtual language subdomainredirects for wikidata - change (operations/apache-config)

Dzahn (Code Review — 2013-05-25T12:50:15

Dzahn has uploaded a new change for review.

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


Change subject: add virtual language subdomain redirects for wikidata
......................................................................

add virtual language subdomain redirects for wikidata

redirect anything NOT www to redirector.php and pass the path

Change-Id: I1cda5c2544bb06d960a1ebef9398cd106ccb4144
---
M main.conf
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config refs/changes/43/65443/1

diff --git a/main.conf b/main.conf
index 3d27ded..ed5faa0 100644
--- a/main.conf
+++ b/main.conf
< at >< at > -72,6 +72,10 < at >< at >
     RewriteRule ^/$ /w/index.php
     RewriteRule ^/w/$ /w/index.php
 
+    # redirects for wikidata language subdomains
+    RewriteCond %{HTTP_HOST} !(^www\.wikidata\.org$)
+    RewriteRule ^(.*)$ /usr/local/apache/common/docroot/wikidata/w/redirector.php?path=$1 [L]
+
     # Configurable favicon
     RewriteRule ^/favicon\.ico$ /w/favicon.php [L]

[MediaWiki-commits] [Gerrit] Fix undefined i18n message in categorypopout - change (mediawiki...VisualEditor)

Catrope (Code Review — 2013-05-25T12:50:07

Catrope has uploaded a new change for review.

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


Change subject: Fix undefined i18n message in category popout
......................................................................

Fix undefined i18n message in category popout

Message was renamed earlier but this caller wasn't updated

Change-Id: I7ec37c6e0fd6fbbe766166704ea797c9ffd6684b
---
M modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js b/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index e0350d5..144e086 100644
--- a/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
< at >< at > -43,7 +43,7 < at >< at >
 this.$.addClass( 've-ui-mwCategoryPopupMenu' ).hide();
 this.$title
 .addClass( 've-ui-mwCategoryPopupTitle ve-ui-icon-tag' )
-.text( ve.msg( 'visualeditor-category-settings-label' ) );
+.text( ve.msg( 'visualeditor-dialog-meta-categories-settings-label' ) );
 this.$menu.append(
 this.$title,
 this.removeButton.$.addClass( 've-ui-mwCategoryRemoveButton' ),

[MediaWiki-commits] [Gerrit] Make reference editing work - change(mediawiki...VisualEditor)

Catrope (Code Review — 2013-05-25T12:45:41

Catrope has uploaded a new change for review.

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


Change subject: Make reference editing work
......................................................................

Make reference editing work

The only reason it doesn't save correctly right now is because Parsoid
doesn't serialize reference edits correctly.

Change-Id: Ia0f272c07cc28ee829372eb848f23aec99eb92f0
---
M modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve/dm/ve.dm.InternalList.js
2 files changed, 6 insertions(+), 9 deletions(-)


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

diff --git a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
index 9855603..7ebe962 100644
--- a/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWReferenceNode.js
< at >< at > -36,12 +36,10 < at >< at >
 ve.dm.MWReferenceNode.static.toDataElement = function ( domElements, converter ) {
 var dataElement, listIndex,
 about = domElements[0].getAttribute( 'about' ),
-// TODO: this is always-present in the new spec, so "|| '{}'" can be removed later
 mw = JSON.parse( domElements[0].getAttribute( 'data-mw' ) || '{}' ),
-// TODO: this will be stored in mw.body.html in the new spec
-body = JSON.parse( domElements[0].getAttribute( 'data-parsoid' ) ).src,
-// TODO: this will be stored in mw.name in the new spec
-name = $( body ).attr( 'name' ),
+body = mw.body.html,
+// TODO: this should be in mw.name but that's always set to 'ref'
+name = $( domElements[0] ).children( 'a' ).attr( 'href' ),
 key = name !== null ? name : ve.getHash( body );
 
 listIndex = converter.internalList.addItem( key, body );
< at >< at > -73,9 +71,8 < at >< at >
 ),
 itemNodeHtml = $( itemNodeWrapper ).html();
 
-// TODO: store internalNodeHtml in data.mw:
-// dataElement.attributes.mw.body.html = itemNodeHtml;
-// span.setAttribute( 'data-mw', JSON.stringify( dataElement.attributes.mw ) );
+dataElement.attributes.mw.body.html = itemNodeHtml;
+span.setAttribute( 'data-mw', JSON.stringify( dataElement.attributes.mw ) );
 
 return [ span ];
 };
diff --git a/modules/ve/dm/ve.dm.InternalList.js b/modules/ve/dm/ve.dm.InternalList.js
index db5cb82..db39eaa 100644
--- a/modules/ve/dm/ve.dm.InternalList.js
+++ b/modules/ve/dm/ve.dm.InternalList.js
< at >< at > -118,7 +118,7 < at >< at >
 if ( itemsHtml.length ) {
 list.push( { 'type': 'internalList' } );
 for ( i = 0, length = itemsHtml.length; i < length; i++ ) {
-itemData = converter.getDataFromDomRecursion( $( itemsHtml[i] )[0] );
+itemData = converter.getDataFromDomRecursion( $( '<div>' ).html( itemsHtml[i] )[0] );
 list = list.concat(
 [{ 'type': 'internalItem' }],
 itemData,

[MediaWiki-commits] [Gerrit] Remove the id "anonlogin" - change(mediawiki/core)

Waldir (Code Review — 2013-05-25T12:45:25

Waldir has uploaded a new change for review.

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


Change subject: Remove the id "anonlogin"
......................................................................

Remove the id "anonlogin"

This was used as an alternative id for the login link
in the personal tools at the top right.

This seems to have been inherited since the days of the PHPTal-based skins
(at least git blame shows their presence back in Brion's rewrite of the skin
in november 2004).

I've asked several people about this (Brion, Tyler, Roan, Timo, Bartosz)
And nobody could figure out why it is needed.
After all, whenever the user sees the login link it means they are
using the wiki as an anonymous user.

My best guess is that this is meant to allow the ability
to style the login differently when the user has already made an edit
anonymously (which is, if I'm not mistaken, when the anon userlinks are shown,
i.e. the links to the IP userpage and talkpage are visible),
but I see no evidence of this, and in any case it would be better to change
the class of the whole personal tools div instead of changing the link IDs.

Change-Id: Ib3445934853db5361c3c6fecfe75623b0b921400
---
M includes/SkinTemplate.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/dictionary/mediawiki.dic
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
M skins/CologneBlue.php
7 files changed, 5 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/65440/1

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index e3a6ccf..fd4abeb 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
< at >< at > -659,10 +659,8 < at >< at >
 : 'login';
 $is_signup = $request->getText( 'type' ) == 'signup';
 
-# anonlogin & login are the same
 $proto = $wgSecureLogin ? PROTO_HTTPS : null;
 
-$login_id = $this->showIPinHeader() ? 'anonlogin' : 'login';
 $login_url = array(
 'text' => $this->msg( $loginlink )->text(),
 'href' => self::makeSpecialUrl( 'Userlogin', $returnto, $proto ),
< at >< at > -698,7 +696,7 < at >< at >
 $personal_urls['createaccount'] = $createaccount_url;
 }
 
-$personal_urls[$login_id] = $login_url;
+$personal_urls['login'] = $login_url;
 }
 
 wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index bc3a381..81a3855 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
< at >< at > -3623,7 +3623,6 < at >< at >
 'accesskey-pt-watchlist'                => 'l', # do not translate or duplicate this message to other languages
 'accesskey-pt-mycontris'                => 'y', # do not translate or duplicate this message to other languages
 'accesskey-pt-login'                    => 'o', # do not translate or duplicate this message to other languages
-'accesskey-pt-anonlogin'                => 'o', # do not translate or duplicate this message to other languages
 'accesskey-pt-logout'                   => '', # do not translate or duplicate this message to other languages
 'accesskey-ca-talk'                     => 't', # do not translate or duplicate this message to other languages
 'accesskey-ca-edit'                     => 'e', # do not translate or duplicate this message to other languages
< at >< at > -3693,7 +3692,6 < at >< at >
 'tooltip-pt-watchlist'                => 'A list of pages you are monitoring for changes',
 'tooltip-pt-mycontris'                => 'A list of your contributions',
 'tooltip-pt-login'                    => 'You are encouraged to log in; however, it is not mandatory',
-'tooltip-pt-anonlogin'                => 'You are encouraged to log in; however, it is not mandatory',
 'tooltip-pt-logout'                   => 'Log out',
 'tooltip-ca-talk'                     => 'Discussion about the content page',
 'tooltip-ca-edit'                     => 'You can edit this page. Please use the preview button before saving',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 9d5bacb..542d075 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
< at >< at > -1102,8 +1102,8 < at >< at >
 
 See also:
 * {{msg-mw|Login}}
-* {{msg-mw|Accesskey-pt-anonlogin}}
-* {{msg-mw|Tooltip-pt-anonlogin}}
+* {{msg-mw|Accesskey-pt-login}}
+* {{msg-mw|Tooltip-pt-login}}
 {{Identical|Log in}}",
 'nav-login-createaccount' => "Shown to anonymous users in the upper right corner of the page. When you can't create an account, the message {{msg-mw|login}} is shown.
 {{Identical|Log in / create account}}",
< at >< at > -6378,12 +6378,6 < at >< at >
 * {{msg-mw|Accesskey-pt-mycontris}}
 * {{msg-mw|Tooltip-pt-mycontris}}',
 'tooltip-pt-login' => "Tooltip shown when hovering over the link 'Log in / create account' in the upper right corner show on all pages while not logged in.",
-'tooltip-pt-anonlogin' => 'Used as tooltip for link {{msg-mw|Login}} in your personal toolbox (upper right side).
-
-See also:
-* {{msg-mw|Login}}
-* {{msg-mw|Accesskey-pt-anonlogin}}
-* {{msg-mw|Tooltip-pt-anonlogin}}',
 'tooltip-pt-logout' => 'Tooltip shown when hovering over the {{msg-mw|Logout}} link in your personal toolbox (upper right side).
 
 See also:
diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index 59ea18f..0f38827 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
< at >< at > -480,7 +480,6 < at >< at >
 andtitle
 anon
 anoneditwarning
-anonlogin
 anonnotice
 anononly
 anonpreviewwarning
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 17feaf9..5a3dea9 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
< at >< at > -32,7 +32,6 < at >< at >
 'accesskey-pt-watchlist',
 'accesskey-pt-mycontris',
 'accesskey-pt-login',
-'accesskey-pt-anonlogin',
 'accesskey-pt-logout',
 'accesskey-ca-talk',
 'accesskey-ca-edit',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index fdd37e6..b9fa854 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
< at >< at > -2546,7 +2546,6 < at >< at >
 'accesskey-pt-watchlist',
 'accesskey-pt-mycontris',
 'accesskey-pt-login',
-'accesskey-pt-anonlogin',
 'accesskey-pt-logout',
 'accesskey-ca-talk',
 'accesskey-ca-edit',
< at >< at > -2617,7 +2616,6 < at >< at >
 'tooltip-pt-watchlist',
 'tooltip-pt-mycontris',
 'tooltip-pt-login',
-'tooltip-pt-anonlogin',
 'tooltip-pt-logout',
 'tooltip-ca-talk',
 'tooltip-ca-edit',
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index d766b64..d8bb4ae 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
< at >< at > -380,7 +380,7 < at >< at >
 );
 
 $personalUrls = $this->getPersonalTools();
-foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
+foreach ( array( 'logout', 'createaccount', 'login' ) as $key ) {
 if ( $personalUrls[$key] ) {
 $s[] = $this->makeListItem( $key, $personalUrls[$key], array( 'tag' => 'span' ) );
 }
< at >< at > -421,7 +421,7 < at >< at >
 
 // Personal tools ("My pages")
 $qbmyoptions = $this->getPersonalTools();
-foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) {
+foreach ( array( 'logout', 'createaccount', 'login', ) as $key ) {
 $qbmyoptions[$key] = null;
 }

[MediaWiki-commits] [Gerrit] Update CentralAuth to master - change(mediawiki/core)

Reedy (Code Review — 2013-05-25T12:39:06

Reedy has uploaded a new change for review.

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


Change subject: Update CentralAuth to master
......................................................................

Update CentralAuth to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/65439/1

diff --git a/extensions/CentralAuth b/extensions/CentralAuth
index ce28f8c..65e2633 160000
--- a/extensions/CentralAuth
+++ b/extensions/CentralAuth
-Subproject commit ce28f8ccfd0d48e8c5cae06a7d789710abebd8b8
+Subproject commit 65e263389f10911860ffc60a8de72f0bc8a2733f

[MediaWiki-commits] [Gerrit] Only log creations done via themaintenance script once - change (mediawiki...CentralAuth)

Hoo man (Code Review — 2013-05-25T12:35:28

Hoo man has uploaded a new change for review.

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


Change subject: Only log creations done via the maintenance script once
......................................................................

Only log creations done via the maintenance script once

Like Ia84da7840c3487b874426461d3347827bbc2a57a

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


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

diff --git a/maintenance/createLocalAccount.php b/maintenance/createLocalAccount.php
index 09dd85a..661ab88 100644
--- a/maintenance/createLocalAccount.php
+++ b/maintenance/createLocalAccount.php
< at >< at > -34,7 +34,6 < at >< at >
 
 $user->loadDefaults( $username );
 $user->addToDatabase();
-$user->addNewUserLogEntryAutoCreate();
 
 $wgAuth->initUser( $user, true );
 $wgAuth->updateUser( $user );

[MediaWiki-commits] [Gerrit] Don't log autocreations twice - change(mediawiki...CentralAuth)

Hoo man (Code Review — 2013-05-25T12:28:00

Hoo man has uploaded a new change for review.

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


Change subject: Don't log autocreations twice
......................................................................

Don't log autocreations twice

We already log them in the AuthPlugin, no need to have this
logic in the hooks file.

Change-Id: Ia84da7840c3487b874426461d3347827bbc2a57a
---
M CentralAuthHooks.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/CentralAuthHooks.php b/CentralAuthHooks.php
index 36cbd03..1833c84 100644
--- a/CentralAuthHooks.php
+++ b/CentralAuthHooks.php
< at >< at > -676,7 +676,6 < at >< at >
 wfDebug( __METHOD__.": failed with message " . $status->getWikiText() . "\n" );
 return false;
 }
-$user->addNewUserLogEntryAutoCreate();
 
 $wgAuth->initUser( $user, true );

[MediaWiki-commits] [Gerrit] Echo notification for new projectmembership - change (mediawiki...OpenStackManager)

Alex Monk (Code Review — 2013-05-25T12:26:37

Alex Monk has uploaded a new change for review.

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


Change subject: Echo notification for new project membership
......................................................................

Echo notification for new project membership

Bug: 48766
Change-Id: Ic114d2bef0bd46d439d369ff6942d079b818d00c
---
M OpenStackManager.i18n.php
M OpenStackManager.php
M special/SpecialNovaProject.php
3 files changed, 26 insertions(+), 0 deletions(-)


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

diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
index 1e2f14e..30e064c 100644
--- a/OpenStackManager.i18n.php
+++ b/OpenStackManager.i18n.php
< at >< at > -423,9 +423,11 < at >< at >
 'notification-osm-instance-deleted' => '$1 deleted instance \'$3\' in project [[$2]]',
 'notification-osm-instance-build-completed' => '$1 built instance \'$3\' in project [[$2]]',
 'notification-osm-instance-reboot-completed' => '$1 rebooted instance \'$3\' in project [[$2]]',
+'notification-osm-projectmember-added' => '$1 added you to project [[$2]]',
 'echo-category-title-osm-instance-deleted' => 'Deletes an instance from a project I\'m an admin on.',
 'echo-category-title-osm-instance-build-completed' => 'Builds an instance on a project I\'m an admin on.',
 'echo-category-title-osm-instance-reboot-completed' => 'Reboots an instance.',
+'echo-category-title-osm-instance-deleted' => 'Project membership addition',
 
 'prefs-openstack' => 'OpenStack',
 'prefs-openstack-keys' => 'Key list',
< at >< at > -1424,6 +1426,9 < at >< at >
 * $1 - agent
 * $2 - project
 * $3 - instance',
+'notification-osm-projectmember-added' => 'Title for the new project membership notification.
+* $1 - agent
+* $2 - project',
 'echo-category-title-osm-instance-deleted' => 'Used by the Echo extension in the Preferences -> Notifications tab as a label to enable email notification for the osm-instance-deleted event.
 
 Preceded by {{msg-mw|Prefs-emailsubscriptions}}.',
< at >< at > -1431,6 +1436,7 < at >< at >
 
 Preceded by {{msg-mw|Prefs-emailsubscriptions}}.',
 'echo-category-title-osm-instance-reboot-completed' => 'Used by the Echo extension in the Preferences -> Notifications tab as a label to enable email notification for the osm-instance-reboot-completed event.',
+'echo-category-title-osm-instance-deleted' => 'Used by the Echo extension in the Preferences -> Notifications tab as a label to enable email notification for the osm-projectmember-add event.',
 'prefs-openstack' => 'Title for a tab in Preferences for OpenStack related items',
 'prefs-openstack-keys' => 'Subheading used in the Preferences -> OpenStack for a the public SSH key list',
 );
diff --git a/OpenStackManager.php b/OpenStackManager.php
index a4c668b..f23ac0c 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
< at >< at > -250,6 +250,9 < at >< at >
 }
 } elseif ( $event->getType() == 'osm-instance-reboot-completed' ) {
 $users[$event->getAgent()->getId()] = $event->getAgent(); // Only notify the person who did it to say the reboot was completed.
+} elseif ( $event->getType() == 'osm-projectmembers-add' ) {
+$extra = $event->getExtra(); // PHP 5.3 back-compat...
+$users[$extra['userAdded']] = User::newFromId( $extra['userAdded'] );
 }
 unset( $users[0] );
 return true;
< at >< at > -296,6 +299,15 < at >< at >
 $wgDefaultUserOptions["echo-subscriptions-web-osm-instance-deleted"] = true;
 $wgDefaultUserOptions["echo-subscriptions-email-osm-instance-deleted"] = true;
 
+$wgEchoNotifications['osm-projectmembers-add'] = array(
+'formatter-class' => 'EchoBasicFormatter',
+'category' => 'osm-projectmembers-add',
+'title-message' => 'notification-osm-projectmember-added',
+'title-params' => array( 'agent', 'title' ),
+'icon' => 'placeholder',
+'payload' => array( 'summary' )
+);
+
 /**
  * < at >param $updater DatabaseUpdater
  * < at >return bool
diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php
index b13cfe4..18be30d 100644
--- a/special/SpecialNovaProject.php
+++ b/special/SpecialNovaProject.php
< at >< at > -654,6 +654,14 < at >< at >
 $success = $project->addMember( $member );
 if ( $success ) {
 $this->getOutput()->addWikiMsg( 'openstackmanager-addedto', $formData['member'], $formData['projectname'] );
+if ( class_exists( 'EchoEvent' ) ) {
+EchoEvent::create( array(
+'type' => 'osm-projectmembers-add',
+'title' => Title::newFromText( $formData['projectname'], NS_NOVA_RESOURCE ),
+'agent' => $this->getUser(),
+'extra' => array( 'userAdded' => $user->getId() ),
+) );
+}
 } else {
 $this->getOutput()->addWikiMsg( 'openstackmanager-failedtoadd', $formData['member'], $formData['projectname'] );
 }

[MediaWiki-commits] [Gerrit] Remove duplicated code breaking thetemplate dialog - change (mediawiki...VisualEditor)

Catrope (Code Review — 2013-05-25T12:23:56

Catrope has uploaded a new change for review.

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


Change subject: Remove duplicated code breaking the template dialog
......................................................................

Remove duplicated code breaking the template dialog

Change-Id: Ied5dc71106601ab354441c2d81507b616553c0d9
---
M modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
index dd764d7..081ceaf 100644
--- a/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
< at >< at > -113,9 +113,6 < at >< at >
 // TODO: Use paramData.deprecation
 // TODO: Use paramData.default
 // TODO: Use paramData.type
-fieldset = new ve.ui.FieldsetLayout( { '$$': this.frame.$$, 'label': label, 'icon': 'parameter' } );
-textInput = new ve.ui.TextInputWidget( { '$$': this.frame.$$, 'multiline': true } );
-textInput.$input.css('height', 100);
 
 if ( description  ) {
 inputLabel = new ve.ui.InputLabelWidget( {

[MediaWiki-commits] [Gerrit] Renaming files to follow nameconventions - change (mediawiki/core)

DMaggot (Code Review — 2013-05-25T12:18:34

DMaggot has uploaded a new change for review.

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


Change subject: Renaming files to follow name conventions
......................................................................

Renaming files to follow name conventions

Change-Id: I2ed94a61214439d5c70d04bd1dbddd68754b595e
---
R tests/phpunit/includes/upload/UploadBaseTest.php
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/upload/UploadTest.php b/tests/phpunit/includes/upload/UploadBaseTest.php
similarity index 100%
rename from tests/phpunit/includes/upload/UploadTest.php
rename to tests/phpunit/includes/upload/UploadBaseTest.php

[MediaWiki-commits] [Gerrit] whitelist Tyler Romeo - change(integration/zuul-config)

Hashar (Code Review — 2013-05-25T12:10:58

Hashar has uploaded a new change for review.

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


Change subject: whitelist Tyler Romeo
......................................................................

whitelist Tyler Romeo

Parent5446 got +2 on core, might as well adds in him :-)

Change-Id: I6571c51d3b4a23614df8d5274d0788d463400966
---
M layout.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/33/65433/1

diff --git a/layout.yaml b/layout.yaml
index 904018d..47aef0b 100644
--- a/layout.yaml
+++ b/layout.yaml
< at >< at > -36,7 +36,7 < at >< at >
         # TODO: Figure out a way to not have to repeat this from pipeline 'test'.
         # This email_filter and the one for 'test' can be removed once we have fixed bug 45499.
         email_filter:
-         - ^(?!(.*?< at >wikimedia\.org|.*?< at >wikimedia\.de|anomie\.wikipedia< at >gmail\.com|amir\.aharoni< at >mail\.huji\.ac\.il|hashar< at >free\.fr|jeroendedauw< at >gmail\.com|maxsem\.wiki< at >gmail\.com|mtraceur< at >member\.fsf\.org|niklas\.laxstrom< at >gmail\.com|s\.mazeland< at >xs4all\.nl|stefan\.petrea< at >gmail\.com|stefan< at >garage-coding\.com|roan\.kattouw< at >gmail\.com|krinklemail< at >gmail\.com|trevorparscal< at >gmail\.com|inez< at >wikia-inc\.com|orbit< at >framezero\.com|aude\.wiki< at >gmail\.com|bawolff\+wn< at >gmail\.com|bryan\.tongminh< at >gmail\.com|dereckson< at >espace-win\.org|hartman\.wiki< at >gmail\.com|hoo< at >online\.de|codereview< at >emsenhuber\.ch|daniel< at >nadir-seen-fire\.com|jamesin\.hongkong\.1< at >gmail\.com|krenair< at >gmail\.com|liangent< at >gmail\.com|mah< at >everybody\.org|matma\.rex< at >gmail\.com|raimond\.spekking< at >gmail\.com|robinp\.1273< at >gmail\.com|tim< at >tim-landscheidt\.de|umherirrender_de\.wp< at >web\.de|yuriastrakhan< at >gmail\.com|yaron57< at >gmail\.com|markus< at >semantic-mediawiki\.org|s7eph4n< at >gmail\.org|wiki< at >physikerwelt\.de)).*$
+         - ^(?!(.*?< at >wikimedia\.org|.*?< at >wikimedia\.de|anomie\.wikipedia< at >gmail\.com|amir\.aharoni< at >mail\.huji\.ac\.il|hashar< at >free\.fr|jeroendedauw< at >gmail\.com|maxsem\.wiki< at >gmail\.com|mtraceur< at >member\.fsf\.org|niklas\.laxstrom< at >gmail\.com|s\.mazeland< at >xs4all\.nl|stefan\.petrea< at >gmail\.com|stefan< at >garage-coding\.com|roan\.kattouw< at >gmail\.com|krinklemail< at >gmail\.com|trevorparscal< at >gmail\.com|inez< at >wikia-inc\.com|orbit< at >framezero\.com|aude\.wiki< at >gmail\.com|bawolff\+wn< at >gmail\.com|bryan\.tongminh< at >gmail\.com|dereckson< at >espace-win\.org|hartman\.wiki< at >gmail\.com|hoo< at >online\.de|codereview< at >emsenhuber\.ch|daniel< at >nadir-seen-fire\.com|jamesin\.hongkong\.1< at >gmail\.com|krenair< at >gmail\.com|liangent< at >gmail\.com|mah< at >everybody\.org|matma\.rex< at >gmail\.com|raimond\.spekking< at >gmail\.com|robinp\.1273< at >gmail\.com|tim< at >tim-landscheidt\.de|tylerromeo< at >gmail\.com|umherirrender_de\.wp< at >web\.de|yuriastrakhan< at >gmail\.com|yaron57< at >gmail\.com|markus< at >semantic-mediawiki\.org|s7eph4n< at >gmail\.org|wiki< at >physikerwelt\.de)).*$
       - event: comment-added
         comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$
     success:
< at >< at > -127,6 +127,7 < at >< at >
          - ^raimond\.spekking< at >gmail\.com$
          - ^robinp\.1273< at >gmail\.com$
          - ^tim< at >tim-landscheidt\.de$
+         - ^tylerromeo< at >gmail\.com$
          - ^umherirrender_de\.wp< at >web\.de$
          - ^yuriastrakhan< at >gmail\.com$
          - ^yaron57< at >gmail\.com$

[MediaWiki-commits] [Gerrit] Add a quantum function! - change(test...examples)

Psychoslave (Code Review — 2013-05-25T11:57:41

Psychoslave has uploaded a new change for review.

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


Change subject: Add a quantum function!
......................................................................

Add a quantum function!

Change-Id: I5dc1e834a843995ae6690a2df2207a60a9c2c876
---
M Example/Example.body.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki/extensions/examples refs/changes/31/65431/1

diff --git a/Example/Example.body.php b/Example/Example.body.php
index a4a7826..21eaf8f 100644
--- a/Example/Example.body.php
+++ b/Example/Example.body.php
< at >< at > -20,4 +20,8 < at >< at >
 function getVersion() {
  return '0.043';
 }
+
+    function generateEntropy(){
+        return 'miaou! I'm undead';
+    }
 }