[MediaWiki-commits] [Gerrit] Remove $wgCategoryTreeDynamicTag = true - change (operations/mediawiki-config)

2014-01-11 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

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


Change subject: Remove $wgCategoryTreeDynamicTag = true
..

Remove $wgCategoryTreeDynamicTag = true

Bug: 59798
Change-Id: I7565f0feeed8c4a2780490f8064e626d6e393faa
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8c80447..abe7960 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -595,7 +595,6 @@
 
 if ( $wmgUseCategoryTree ) {
require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-   $wgCategoryTreeDynamicTag = true;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
 }

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

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

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

[MediaWiki-commits] [Gerrit] Remove $wgCategoryTreeDynamicTag = true - change (operations/mediawiki-config)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove $wgCategoryTreeDynamicTag = true
..


Remove $wgCategoryTreeDynamicTag = true

Bug: 59798
Change-Id: I7565f0feeed8c4a2780490f8064e626d6e393faa
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8c80447..abe7960 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -595,7 +595,6 @@
 
 if ( $wmgUseCategoryTree ) {
require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-   $wgCategoryTreeDynamicTag = true;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7565f0feeed8c4a2780490f8064e626d6e393faa
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] WebInstaller: Don't call getSoftwareLink() - change (mediawiki/core)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: WebInstaller: Don't call getSoftwareLink()
..


WebInstaller: Don't call getSoftwareLink()

This gets the web installer working without the mysql or mysqli
PHP extension, which is not needed for other database systems.

* Avoid "lego" construction: put link text directly in the messages,
  which because the messages are parsed as wikitext, is easy to do.
* Put URLs in separate, ignored messages to avoid duplication in
  Database*::getSoftwareLink().
* Because I had to touch a MySQL-related i18n message, I figured
  this would be a good time to address bug 28281 (regarding MySQL
  forks and Special:Version).
* Other miscellaneous message changes, such as recommending the
  mysqli PHP extension over the old, deprecated mysql extension.

Bug: 28281
Bug: 58167
Manually cherry picked from Change-Id: I6dbc9d32c8c2d8f233a67d574229b80444885aea

Change-Id: I6296a106ffaf5f24fca29eacadc7721d9b83340c
---
M RELEASE-NOTES-1.22
M includes/db/DatabaseMssql.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseOracle.php
M includes/db/DatabasePostgres.php
M includes/db/DatabaseSqlite.php
M includes/installer/Installer.i18n.php
M includes/installer/WebInstallerPage.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
12 files changed, 69 insertions(+), 20 deletions(-)

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



diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 6bff5b1..1fac0e4 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -9,6 +9,7 @@
 * Breaking Changes in 1.22.0
 * New features in 1.22.0
 * Configuration changes in 1.22.0
+* Bug fixes in 1.22.1
 * Bug fixes in 1.22.0
 * API changes in 1.22.0
 * Languages updated in 1.22.1
@@ -325,6 +326,10 @@
   script they were added for.
 * Default value of $wgMaxShellMemory has been tripled (it's now 300 MB).
 
+=== Bug fixes in 1.22.1 ===
+* (bug 58167) The web installer no longer throws an exception when PHP is
+  compiled without support for MySQL yet with support for another DBMS.
+
 === Bug fixes in 1.22.0 ===
 * (bug 47271) $wgContentHandlerUseDB should be set to false during the upgrade
 * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 240a097..37f5372 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -655,7 +655,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return "[http://www.microsoft.com/sql/ MS SQL Server]";
+   return "[{{int:version-db-mssql-url}} MS SQL Server]";
}
 
/**
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 26c9d24..8f12b92 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -681,7 +681,14 @@
 * @return string
 */
public function getSoftwareLink() {
-   return '[http://www.mysql.com/ MySQL]';
+   $version = $this->getServerVersion();
+   if ( strpos( $version, 'MariaDB' ) !== false ) {
+   return '[{{int:version-db-mariadb-url}} MariaDB]';
+   } elseif ( strpos( $version, 'percona' ) !== false ) {
+   return '[{{int:version-db-percona-url}} Percona 
Server]';
+   } else {
+   return '[{{int:version-db-mysql-url}} MySQL]';
+   }
}
 
/**
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index fbaa4da..32d4d98 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -846,7 +846,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return '[http://www.oracle.com/ Oracle]';
+   return '[{{int:version-db-oracle-url}} Oracle]';
}
 
/**
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index e564a16..576bbd9 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1060,7 +1060,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return '[http://www.postgresql.org/ PostgreSQL]';
+   return '[{{int:version-db-postgres-url}} PostgreSQL]';
}
 
/**
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 4a51226..3e03464 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -614,7 +614,7 @@
 * @return string w

[MediaWiki-commits] [Gerrit] Allow all users to view Special:UserRights - change (mediawiki/core)

2014-01-11 Thread Jackmcbarn (Code Review) 
Jackmcbarn has uploaded a new change for review.

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


Change subject: Allow all users to view Special:UserRights
..

Allow all users to view Special:UserRights

Allow Special:UserRights to always be used in read-only mode, rather than
completely locking out users who cannot make modifications with it.

Bug: 25319
Change-Id: I57e9ca4f20fe557e4024c4f5a4865170f02ebb45
---
M includes/specials/SpecialUserrights.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
3 files changed, 42 insertions(+), 92 deletions(-)


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

diff --git a/includes/specials/SpecialUserrights.php 
b/includes/specials/SpecialUserrights.php
index 014408e..71310ea 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -37,31 +37,6 @@
parent::__construct( 'Userrights' );
}
 
-   public function isRestricted() {
-   return true;
-   }
-
-   public function userCanExecute( User $user ) {
-   return $this->userCanChangeRights( $user, false );
-   }
-
-   /**
-* @param User $user
-* @param bool $checkIfSelf
-* @return bool
-*/
-   public function userCanChangeRights( $user, $checkIfSelf = true ) {
-   $available = $this->changeableGroups();
-   if ( $user->getId() == 0 ) {
-   return false;
-   }
-   return !empty( $available['add'] )
-   || !empty( $available['remove'] )
-   || ( ( $this->isself || !$checkIfSelf ) &&
-   ( !empty( $available['add-self'] )
-   || !empty( $available['remove-self'] ) 
) );
-   }
-
/**
 * Manage forms to be shown according to posted data.
 * Depending on the submit button used, call a form or a save function.
@@ -70,9 +45,6 @@
 * @throws UserBlockedError|PermissionsError
 */
public function execute( $par ) {
-   // If the visitor doesn't have permissions to assign or remove
-   // any groups, it's a bit silly to give them the user search 
prompt.
-
$user = $this->getUser();
 
/*
@@ -94,36 +66,8 @@
 
$available = $this->changeableGroups();
 
-   if ( $this->mTarget === null ) {
-   /*
-* If the user specified no target, and they can only
-* edit their own groups, automatically set them as the
-* target.
-*/
-   if ( !count( $available['add'] ) && !count( 
$available['remove'] ) ) {
-   $this->mTarget = $user->getName();
-   }
-   }
-
if ( User::getCanonicalName( $this->mTarget ) == 
$user->getName() ) {
$this->isself = true;
-   }
-
-   if ( !$this->userCanChangeRights( $user, true ) ) {
-   if ( $this->isself && $request->getCheck( 'success' ) ) 
{
-   // bug 48609: if the user just removed its own 
rights, this would
-   // leads it in a "permissions error" page. In 
that case, show a
-   // message that it can't anymore use this page 
instead of an error
-   $this->setHeaders();
-   $out = $this->getOutput();
-   $out->wrapWikiMsg( "\n$1\n", 'userrights-removed-self' );
-   $out->returnToMain();
-   return;
-   }
-
-   // @todo FIXME: There may be intermediate groups we can 
mention.
-   $msg = $user->isAnon() ? 'userrights-nologin' : 
'userrights-notallowed';
-   throw new PermissionsError( null, array( array( $msg ) 
) );
}
 
$this->checkReadOnly();
@@ -135,9 +79,7 @@
$out->addModuleStyles( 'mediawiki.special' );
 
// show the general form
-   if ( count( $available['add'] ) || count( $available['remove'] 
) ) {
-   $this->switchForm();
-   }
+   $this->switchForm();
 
if (
$request->wasPosted() &&
@@ -489,38 +431,51 @@
Linker::TOOL_LINKS_EMAIL /* Add "send e-mail" 
link */
);
 
+   list( $groupCheckboxes, $needForm ) = $this->groupCheckboxes( 
$groups, $user );
+
+   if( $needForm ) {
+   $this->getOutput()->addHTML(
+

[MediaWiki-commits] [Gerrit] WIP: Puppetize aliases and NAT for LabsDB replica servers - change (operations/puppet)

2014-01-11 Thread Tim Landscheidt (Code Review) 
Tim Landscheidt has uploaded a new change for review.

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


Change subject: WIP: Puppetize aliases and NAT for LabsDB replica servers
..

WIP: Puppetize aliases and NAT for LabsDB replica servers

Change-Id: Ica4e23cfd407348d7553ab5da9eaab088dabc751
---
M manifests/role/db.pp
1 file changed, 528 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/107010/1

diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 987123c..9f7514a 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -94,6 +94,534 @@
 }
 }
 
+class role::labsdb::client {
+system::role {"role::db::client": description => "LabsDB client" }
+
+# TODO: DRY; this list is (should) already be maintained somewhere.
+# TODO: Using static IP addresses for the LabsDB servers seems bad(TM).
+host { 's1.labsdb':
+ip => '192.168.99.1',
+host_aliases => [ 'enwiki.labsdb' ];
+}
+
+host { 's2.labsdb':
+ip => '192.168.99.2',
+
+host_aliases => [ 'bgwiki.labsdb', 'bgwiktionary.labsdb',
+  'cswiki.labsdb', 'enwikiquote.labsdb',
+  'enwiktionary.labsdb', 'eowiki.labsdb',
+  'fiwiki.labsdb', 'idwiki.labsdb',
+  'itwiki.labsdb', 'nlwiki.labsdb',
+  'nowiki.labsdb', 'plwiki.labsdb',
+  'ptwiki.labsdb', 'svwiki.labsdb',
+  'thwiki.labsdb', 'trwiki.labsdb',
+  'zhwiki.labsdb' ];
+}
+
+host { 's3.labsdb':
+ip => '192.168.99.3',
+host_aliases => [ 'aawiki.labsdb', 'aawikibooks.labsdb',
+  'aawiktionary.labsdb', 'abwiki.labsdb',
+  'abwiktionary.labsdb', 'acewiki.labsdb',
+  'advisorywiki.labsdb', 'afwiki.labsdb',
+  'afwikibooks.labsdb', 'afwikiquote.labsdb',
+  'afwiktionary.labsdb', 'akwiki.labsdb',
+  'akwikibooks.labsdb', 'akwiktionary.labsdb',
+  'alswiki.labsdb', 'alswikibooks.labsdb',
+  'alswikiquote.labsdb',
+  'alswiktionary.labsdb', 'amwiki.labsdb',
+  'amwikiquote.labsdb', 'amwiktionary.labsdb',
+  'angwiki.labsdb', 'angwikibooks.labsdb',
+  'angwikiquote.labsdb',
+  'angwikisource.labsdb',
+  'angwiktionary.labsdb', 'anwiki.labsdb',
+  'anwiktionary.labsdb', 'arcwiki.labsdb',
+  'arwikibooks.labsdb', 'arwikimedia.labsdb',
+  'arwikinews.labsdb', 'arwikiquote.labsdb',
+  'arwikisource.labsdb',
+  'arwikiversity.labsdb',
+  'arwiktionary.labsdb', 'arzwiki.labsdb',
+  'astwiki.labsdb', 'astwikibooks.labsdb',
+  'astwikiquote.labsdb',
+  'astwiktionary.labsdb', 'aswiki.labsdb',
+  'aswikibooks.labsdb', 'aswikisource.labsdb',
+  'aswiktionary.labsdb', 'avwiki.labsdb',
+  'avwiktionary.labsdb', 'aywiki.labsdb',
+  'aywikibooks.labsdb', 'aywiktionary.labsdb',
+  'azwiki.labsdb', 'azwikibooks.labsdb',
+  'azwikiquote.labsdb', 'azwikisource.labsdb',
+  'azwiktionary.labsdb', 'barwiki.labsdb',
+  'bat_smgwiki.labsdb', 'bawiki.labsdb',
+  'bawikibooks.labsdb', 'bclwiki.labsdb',
+  'bdwikimedia.labsdb', 'be_x_oldwiki.labsdb',
+  'betawikiversity.labsdb', 'bewiki.labsdb',
+  'bewikibooks.labsdb', 'bewikimedia.labsdb',
+  'bewikiquote.labsdb', 'bewikisource.labsdb',
+  'bewiktionary.labsdb', 'bgwikibooks.labsdb',
+  'bgwikinews.labsdb', 'bgwikiquote.labsdb',
+  'bgwikisource.labsdb', 'bhwiki.labsdb',
+  'bhwiktionary.labsdb', 'biwiki.labsdb',
+  'biwikibooks.labsdb', 'biwiktionary.labsdb',
+  'bjnwiki.labsdb', 'bmwiki.labsdb',
+  'bmwikibooks.labsdb', 'bmwikiquote.labsdb',
+  'bmwiktionary.labsdb', 'bnwiki.labsdb',
+  'bnwikibooks.labsdb', 'bnwikisource.labsdb',
+  'bnwiktionary.labsdb', 'bowiki.labsdb',
+  'bowikibooks.labsdb', 'bowiktionary.labsdb',
+  'bpywiki.labsdb', 'brwiki.labsdb',
+

[MediaWiki-commits] [Gerrit] SpecialWatchlist: Synchronise some code with newer versions ... - change (mediawiki/core)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: SpecialWatchlist: Synchronise some code with newer versions 
from RC
..


SpecialWatchlist: Synchronise some code with newer versions from RC

Change-Id: Ia6b883330083d05f7edbb6c2a36cb7e54463d05f
---
M includes/specials/SpecialWatchlist.php
1 file changed, 36 insertions(+), 42 deletions(-)

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



diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 9caa5a8..0204c3f 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -201,27 +201,6 @@
return;
}
 
-   # Get namespace value, if supplied, and prepare a WHERE fragment
-   $nameSpace = $opts['namespace'];
-   $invert = $opts['invert'];
-   $associated = $opts['associated'];
-
-   if ( $nameSpace !== '' ) {
-   $eq_op = $invert ? '!=' : '=';
-   $bool_op = $invert ? 'AND' : 'OR';
-   if ( !$associated ) {
-   $nameSpaceClause = "rc_namespace $eq_op 
$nameSpace";
-   } else {
-   $associatedNS = MWNamespace::getAssociated( 
$nameSpace );
-   $nameSpaceClause =
-   "rc_namespace $eq_op $nameSpace " .
-   $bool_op .
-   " rc_namespace $eq_op $associatedNS";
-   }
-   } else {
-   $nameSpaceClause = '';
-   }
-
# Possible where conditions
$conds = array();
 
@@ -248,8 +227,26 @@
if ( $user->useRCPatrol() && $opts['hidepatrolled'] ) {
$conds[] = 'rc_patrolled != 1';
}
-   if ( $nameSpaceClause ) {
-   $conds[] = $nameSpaceClause;
+   # Namespace filtering
+   if ( $opts['namespace'] !== '' ) {
+   $selectedNS = $dbr->addQuotes( $opts['namespace'] );
+   $operator = $opts['invert'] ? '!=' : '=';
+   $boolean = $opts['invert'] ? 'AND' : 'OR';
+
+   # namespace association (bug 2429)
+   if ( !$opts['associated'] ) {
+   $condition = "rc_namespace $operator 
$selectedNS";
+   } else {
+   # Also add the associated namespace
+   $associatedNS = $dbr->addQuotes(
+   MWNamespace::getAssociated( 
$opts['namespace'] )
+   );
+   $condition = "(rc_namespace $operator 
$selectedNS "
+   . $boolean
+   . " rc_namespace $operator 
$associatedNS)";
+   }
+
+   $conds[] = $condition;
}
 
# Toggle watchlist content (all recent edits or just the latest)
@@ -305,8 +302,8 @@
ChangeTags::modifyDisplayQuery( $tables, $fields, $conds, 
$join_conds, $options, '' );
wfRunHooks( 'SpecialWatchlistQuery', array( &$conds, &$tables, 
&$join_conds, &$fields, $opts ) );
 
-   $res = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options, $join_conds );
-   $numRows = $res->numRows();
+   $rows = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options, $join_conds );
+   $numRows = $rows->numRows();
 
/* Start bottom header */
 
@@ -394,7 +391,7 @@
$form .= "\n";
$form .= Html::namespaceSelector(
array(
-   'selected' => $nameSpace,
+   'selected' => $opts['namespace'],
'all' => '',
'label' => $this->msg( 'namespace' )->text()
), array(
@@ -407,14 +404,14 @@
$this->msg( 'invert' )->text(),
'invert',
'nsinvert',
-   $invert,
+   $opts['invert'],
array( 'title' => $this->msg( 'tooltip-invert' 
)->text() )
) . ' ';
$form .= Xml::checkLabel(
$this->msg( 'namespace_association' )->text(),
'associated',
'associated',
-   $associated,
+   $opts['associated'],
array( 'title' => $this->msg( 
'tooltip-n

[MediaWiki-commits] [Gerrit] SpecialWatchlist: JS enhancements to namespace selector (lik... - change (mediawiki/core)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: SpecialWatchlist: JS enhancements to namespace selector (like 
RC)
..


SpecialWatchlist: JS enhancements to namespace selector (like RC)

Just load the same modules SpecialRecentChanges does. We only need to
change an id on one form element for it to work.

Change-Id: I0bfad7776907a094335089f86dec1de6456d85c8
---
M includes/specials/SpecialWatchlist.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 0204c3f..c947c78 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -170,6 +170,7 @@
 
$this->setHeaders();
$this->outputHeader();
+   $this->addModules();
 
// Add feed links
$wlToken = $user->getTokenFromOption( 'watchlisttoken' );
@@ -410,7 +411,7 @@
$form .= Xml::checkLabel(
$this->msg( 'namespace_association' )->text(),
'associated',
-   'associated',
+   'nsassociated',
$opts['associated'],
array( 'title' => $this->msg( 
'tooltip-namespace_association' )->text() )
) . ' ';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bfad7776907a094335089f86dec1de6456d85c8
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] DatabaseInstaller::setVarsFromRequest needs array - change (mediawiki/core)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: DatabaseInstaller::setVarsFromRequest needs array
..


DatabaseInstaller::setVarsFromRequest needs array

Method is not marked as var args.

Bug: 58434
Follow-Up: I920b0231db1b70b68c6c8907257c288a0e112668
Change-Id: Ief7f7c06e75efbe7ae1da13f5021a9062483f690
(cherry picked from commit 29c2ab3da0d561428f1fc969daadcac463e675b6)
---
M RELEASE-NOTES-1.22
M includes/installer/OracleInstaller.php
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 46f31ba..0a377a5 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -1,6 +1,16 @@
+= MediaWiki release notes =
+
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.22.1 ==
+
+This is a security and maintenance release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.0 ===
+
+* (bug 58434) The broken installer for database backend Oracle was fixed.
+
 == MediaWiki 1.22.0 ==
 
 MediaWiki 1.22.0 is the stable branch and is recommended for use in production.
diff --git a/includes/installer/OracleInstaller.php 
b/includes/installer/OracleInstaller.php
index 7757510..8ce74f4 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -91,12 +91,12 @@
 
public function submitConnectForm() {
// Get variables from the request
-   $newValues = $this->setVarsFromRequest(
+   $newValues = $this->setVarsFromRequest( array(
'wgDBserver',
'wgDBprefix',
'wgDBuser',
'wgDBpassword'
-   );
+   ) );
$this->parent->setVar( 'wgDBname', $this->getVar( 'wgDBuser' ) 
);
 
// Validate them

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7f7c06e75efbe7ae1da13f5021a9062483f690
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Set the correct special page headers so that "What links her... - change (mediawiki...SocialProfile)

2014-01-11 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review.

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


Change subject: Set the correct special page headers so that "What links here" 
and "Page info" won't show up on the toolbox when you're viewing these special 
pages.
..

Set the correct special page headers so that "What links here" and "Page
info" won't show up on the toolbox when you're viewing these special
pages.

Also fixed a bug with the "Use social userpage/Use wiki userpage" button
label message in UserProfile/UserProfilePage.php. Previously it would
display (at least initially) "Use social userpage" even when you were
already using it (in which case the label should've prompted you to "Use
wiki userpage" instead).

Change-Id: I0269d5ed560f233bd0736ac710d00b5c71f2
---
M SystemGifts/SpecialPopulateAwards.php
M SystemGifts/SpecialRemoveMasterSystemGift.php
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M SystemGifts/SpecialViewSystemGift.php
M SystemGifts/SpecialViewSystemGifts.php
M SystemGifts/TopAwards.php
M UserActivity/UserActivity.body.php
M UserBoard/SpecialSendBoardBlast.php
M UserBoard/SpecialUserBoard.php
M UserGifts/SpecialGiftManager.php
M UserGifts/SpecialGiftManagerLogo.php
M UserGifts/SpecialGiveGift.php
M UserGifts/SpecialRemoveGift.php
M UserGifts/SpecialRemoveMasterGift.php
M UserGifts/SpecialViewGift.php
M UserGifts/SpecialViewGifts.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/SpecialUpdateProfile.php
M UserProfile/UserProfilePage.php
M UserRelationship/SpecialViewRelationshipRequests.php
M UserRelationship/SpecialViewRelationships.php
M UserStats/TopFansByStat.php
M UserStats/TopFansRecent.php
M UserStats/TopUsers.php
26 files changed, 78 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/11/107011/1

diff --git a/SystemGifts/SpecialPopulateAwards.php 
b/SystemGifts/SpecialPopulateAwards.php
index a49e19f..0b2ebbb 100644
--- a/SystemGifts/SpecialPopulateAwards.php
+++ b/SystemGifts/SpecialPopulateAwards.php
@@ -45,6 +45,10 @@
return;
}
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
$wgUserLevels = '';
 
$g = new SystemGifts();
diff --git a/SystemGifts/SpecialRemoveMasterSystemGift.php 
b/SystemGifts/SpecialRemoveMasterSystemGift.php
index 72896e5..54d9a06 100644
--- a/SystemGifts/SpecialRemoveMasterSystemGift.php
+++ b/SystemGifts/SpecialRemoveMasterSystemGift.php
@@ -59,6 +59,10 @@
return;
}
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
// Add CSS
$out->addModules( 'ext.socialprofile.systemgifts.css' );
 
diff --git a/SystemGifts/SpecialSystemGiftManager.php 
b/SystemGifts/SpecialSystemGiftManager.php
index f3b26a6..b510ed9 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -26,7 +26,8 @@
$request = $this->getRequest();
$user = $this->getUser();
 
-   $out->setPageTitle( $this->msg( 'systemgiftmanager' )->plain() 
);
+   // Set the page title, robot policies, etc.
+   $this->setHeaders();
 
// If the user doesn't have the required 'awardsmanage' 
permission, display an error
if ( !$user->isAllowed( 'awardsmanage' ) ) {
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php 
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index 7d983de..85cd4c0 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -35,6 +35,10 @@
$request = $this->getRequest();
$user = $this->getUser();
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
// If the user doesn't have the required 'awardsmanage' 
permission, display an error
if ( !$user->isAllowed( 'awardsmanage' ) ) {
$out->permissionRequired( 'awardsmanage' );
diff --git a/SystemGifts/SpecialViewSystemGift.php 
b/SystemGifts/SpecialViewSystemGift.php
index 82f4d41..57bce35 100644
--- a/SystemGifts/SpecialViewSystemGift.php
+++ b/SystemGifts/SpecialViewSystemGift.php
@@ -26,6 +26,9 @@
$out = $this->getOutput();
$user = $this->getUser();
 
+   // Set the page title, robot policies, etc.
+   $this->setHeaders();
+
// Add CSS
$out->addModules( 'ext.socialprofile.systemg

[MediaWiki-commits] [Gerrit] Set the correct special page headers so that "What links her... - change (mediawiki...SocialProfile)

2014-01-11 Thread Jack Phoenix (Code Review) 
Jack Phoenix has submitted this change and it was merged.

Change subject: Set the correct special page headers so that "What links here" 
and "Page info" won't show up on the toolbox when you're viewing these special 
pages.
..


Set the correct special page headers so that "What links here" and "Page
info" won't show up on the toolbox when you're viewing these special
pages.

Also fixed a bug with the "Use social userpage/Use wiki userpage" button
label message in UserProfile/UserProfilePage.php. Previously it would
display (at least initially) "Use social userpage" even when you were
already using it (in which case the label should've prompted you to "Use
wiki userpage" instead).

Change-Id: I0269d5ed560f233bd0736ac710d00b5c71f2
---
M SystemGifts/SpecialPopulateAwards.php
M SystemGifts/SpecialRemoveMasterSystemGift.php
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M SystemGifts/SpecialViewSystemGift.php
M SystemGifts/SpecialViewSystemGifts.php
M SystemGifts/TopAwards.php
M UserActivity/UserActivity.body.php
M UserBoard/SpecialSendBoardBlast.php
M UserBoard/SpecialUserBoard.php
M UserGifts/SpecialGiftManager.php
M UserGifts/SpecialGiftManagerLogo.php
M UserGifts/SpecialGiveGift.php
M UserGifts/SpecialRemoveGift.php
M UserGifts/SpecialRemoveMasterGift.php
M UserGifts/SpecialViewGift.php
M UserGifts/SpecialViewGifts.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/SpecialUpdateProfile.php
M UserProfile/UserProfilePage.php
M UserRelationship/SpecialViewRelationshipRequests.php
M UserRelationship/SpecialViewRelationships.php
M UserStats/TopFansByStat.php
M UserStats/TopFansRecent.php
M UserStats/TopUsers.php
26 files changed, 78 insertions(+), 3 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/SystemGifts/SpecialPopulateAwards.php 
b/SystemGifts/SpecialPopulateAwards.php
index a49e19f..0b2ebbb 100644
--- a/SystemGifts/SpecialPopulateAwards.php
+++ b/SystemGifts/SpecialPopulateAwards.php
@@ -45,6 +45,10 @@
return;
}
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
$wgUserLevels = '';
 
$g = new SystemGifts();
diff --git a/SystemGifts/SpecialRemoveMasterSystemGift.php 
b/SystemGifts/SpecialRemoveMasterSystemGift.php
index 72896e5..54d9a06 100644
--- a/SystemGifts/SpecialRemoveMasterSystemGift.php
+++ b/SystemGifts/SpecialRemoveMasterSystemGift.php
@@ -59,6 +59,10 @@
return;
}
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
// Add CSS
$out->addModules( 'ext.socialprofile.systemgifts.css' );
 
diff --git a/SystemGifts/SpecialSystemGiftManager.php 
b/SystemGifts/SpecialSystemGiftManager.php
index f3b26a6..b510ed9 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -26,7 +26,8 @@
$request = $this->getRequest();
$user = $this->getUser();
 
-   $out->setPageTitle( $this->msg( 'systemgiftmanager' )->plain() 
);
+   // Set the page title, robot policies, etc.
+   $this->setHeaders();
 
// If the user doesn't have the required 'awardsmanage' 
permission, display an error
if ( !$user->isAllowed( 'awardsmanage' ) ) {
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php 
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index 7d983de..85cd4c0 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -35,6 +35,10 @@
$request = $this->getRequest();
$user = $this->getUser();
 
+   // Set the robot policies, etc.
+   $out->setArticleRelated( false );
+   $out->setRobotPolicy( 'noindex,nofollow' );
+
// If the user doesn't have the required 'awardsmanage' 
permission, display an error
if ( !$user->isAllowed( 'awardsmanage' ) ) {
$out->permissionRequired( 'awardsmanage' );
diff --git a/SystemGifts/SpecialViewSystemGift.php 
b/SystemGifts/SpecialViewSystemGift.php
index 82f4d41..57bce35 100644
--- a/SystemGifts/SpecialViewSystemGift.php
+++ b/SystemGifts/SpecialViewSystemGift.php
@@ -26,6 +26,9 @@
$out = $this->getOutput();
$user = $this->getUser();
 
+   // Set the page title, robot policies, etc.
+   $this->setHeaders();
+
// Add CSS
$out->addModules( 'ext.socialprofile.systemgifts.css' );
 
diff --git a/SystemGifts/SpecialViewSystemGifts.php 
b/Syst

[MediaWiki-commits] [Gerrit] Call Linker::link statically (1.18) - change (mediawiki...ReplaceText)

2014-01-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Call Linker::link statically (1.18)
..


Call Linker::link statically (1.18)

Change-Id: I9cc16bda8f3db46ccfecbcab094adc9ff5af94f4
---
M SpecialReplaceText.php
1 file changed, 8 insertions(+), 11 deletions(-)

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



diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index 50b884d..34c9432 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -44,8 +44,6 @@
$out = $this->getOutput();
$request = $this->getRequest();
 
-   $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new 
Linker;
-
$this->target = $request->getText( 'target' );
$this->replacement = $request->getText( 'replacement' );
$this->use_regex = $request->getBool( 'use_regex' );
@@ -105,7 +103,7 @@
 
// Link back
$out->addHTML(
-   $linker->link( $this->getTitle(),
+   Linker::link( $this->getTitle(),
$this->msg( 'replacetext_return' 
)->escaped() )
);
 
@@ -188,7 +186,7 @@
}
 
if ( $bad_cat_name ) {
-   $link = $linker->link( $category_title, 
htmlspecialchars( ucfirst( $this->category ) ) );
+   $link = Linker::link( $category_title, 
htmlspecialchars( ucfirst( $this->category ) ) );
$out->addHTML(
$this->msg( 
'replacetext_nosuchcategory' )->rawParams( $link )->escaped()
);
@@ -202,7 +200,7 @@
}
}
// link back to starting form
-   $out->addHTML( '' . $linker->link( 
$this->getTitle(), $this->msg( 'replacetext_return' )->escaped() ) . '' );
+   $out->addHTML( '' . Linker::link( 
$this->getTitle(), $this->msg( 'replacetext_return' )->escaped() ) . '' );
} else {
// Show a warning message if the replacement
// string is either blank or found elsewhere on
@@ -298,7 +296,7 @@
$tables = $this->namespaceTables( $namespaces );
$out->addHTML(
"\n" .
-   "\n" . 
+   "\n" .
Xml::tags( 'h4', null, $this->msg( 'powersearch-ns' 
)->parse() )
);
// The ability to select/unselect groups of namespaces in the
@@ -353,7 +351,7 @@
$category_search_label = $this->msg( 
'replacetext_categorysearch' )->text();
$prefix_search_label = $this->msg( 'replacetext_prefixsearch' 
)->text();
$out->addHTML(
-   "\n" . 
+   "\n" .
Xml::tags( 'h4', null, $this->msg( 
'replacetext_optionalfilters' )->parse() ) .
Xml::element( 'div', array( 'class' => 'divider' ), '', 
false ) .
"$category_search_label\n" .
@@ -417,7 +415,6 @@
global $wgLang, $wgScriptPath;
 
$out = $this->getOutput();
-   $linker = class_exists( 'DummyLinker' ) ? new DummyLinker : new 
Linker;
 
$formOpts = array( 'id' => 'choose_pages', 'method' => 'post', 
'action' => $this->getTitle()->getFullUrl() );
$out->addHTML(
@@ -441,7 +438,7 @@
list( $title, $context ) = $title_and_context;
$out->addHTML(
Xml::check( $title->getArticleID(), 
true ) .
-   $linker->link( $title ) . " - 
$context\n"
+   Linker::link( $title ) . " - 
$context\n"
);
}
$out->addHTML( '' );
@@ -452,7 +449,7 @@
foreach ( $titles_for_move as $title ) {
$out->addHTML(
Xml::check( 'move-' . 
$title->getArticleID(), true ) .
-   $linker->link( $title ) . "\n"
+   Linker::link( $title ) . "\n"
);
}
$out->addHTML( '' );
@@ -490,7 +487,7 @@
$out->addWikiMsg( 'replacetext_cannotmove', 
$wgLang->formatNum( count( $unmoveable_titles ) ) );

[MediaWiki-commits] [Gerrit] Call Linker::link statically (1.18) - change (mediawiki...PageSchemas)

2014-01-11 Thread Legoktm (Code Review) 
Legoktm has submitted this change and it was merged.

Change subject: Call Linker::link statically (1.18)
..


Call Linker::link statically (1.18)

Change-Id: I1fbddd4f53be1f5cb76b8ef4ca6082fd26290318
---
M specials/PS_GeneratePages.php
1 file changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/specials/PS_GeneratePages.php b/specials/PS_GeneratePages.php
index 47c3e1f..1149bb4 100644
--- a/specials/PS_GeneratePages.php
+++ b/specials/PS_GeneratePages.php
@@ -66,18 +66,12 @@
$pageList[] = $page;
}
}
-   // SpecialPage::getSkin() was added in MW 1.18
-   if ( is_callable( $this, 'getSkin' ) ) {
-   $skin = $this->getSkin();
-   } else {
-   global $wgUser;
-   $skin = $wgUser->getSkin();
-   }
+
foreach ( $pageList as $page ) {
if ( !( $page instanceof Title ) ) { continue; }
$pageName = PageSchemas::titleString( $page );
$text .= Html::input( 'page[]', $pageName, 'checkbox', 
array( 'checked' => true ) );
-   $text .= "\n" . $skin->link( $page ) . "\n";
+   $text .= "\n" . Linker::link( $page ) . "\n";
}
$text .= "\n";
$text .= Html::input( null, wfMessage( 'generatepages' 
)->parse(), 'submit' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fbddd4f53be1f5cb76b8ef4ca6082fd26290318
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageSchemas
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: IAlex 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: NormalUser 

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

[MediaWiki-commits] [Gerrit] make release notes ordering more consistant - change (mediawiki/core)

2014-01-11 Thread MarkAHershberger (Code Review) 
MarkAHershberger has uploaded a new change for review.

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


Change subject: make release notes ordering more consistant
..

make release notes ordering more consistant

Change-Id: Ia48e44a33f5317f2435d65c5021714a9c0dc5806
---
M RELEASE-NOTES-1.22
1 file changed, 9 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/107012/1

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 0f13912..516f986 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -9,7 +9,16 @@
 
 === Changes since 1.22.0 ===
 
+* Restore compatibility with curl < 7.16.2.
+* (bug 56931) Updated the plural rules to CLDR 24. They are in new format
+  which is detailed in UTS 35 Rev 33. The PHP parser and evaluator as well as
+  the JavaScript evaluator were updated to support the new format. Plural rules
+  for some languages have changed, most notably Russian. Affected software
+  messages have been updated and marked for review at translatewiki.net.
+  This change is backported from the development branch of MediaWiki 1.23.
 * (bug 58434) The broken installer for database backend Oracle was fixed.
+* (bug 58167) The web installer no longer throws an exception when PHP is
+  compiled without support for MySQL yet with support for another DBMS.
 
 == MediaWiki 1.22.0 ==
 
@@ -19,12 +28,9 @@
 * Breaking Changes in 1.22.0
 * New features in 1.22.0
 * Configuration changes in 1.22.0
-* Bug fixes in 1.22.1
 * Bug fixes in 1.22.0
 * API changes in 1.22.0
-* Languages updated in 1.22.1
 * Languages updated in 1.22.0
-* Other Changes in 1.22.1
 * Other changes in 1.22.0
 
 === Breaking Changes in 1.22.0 ===
@@ -336,10 +342,6 @@
   script they were added for.
 * Default value of $wgMaxShellMemory has been tripled (it's now 300 MB).
 
-=== Bug fixes in 1.22.1 ===
-* (bug 58167) The web installer no longer throws an exception when PHP is
-  compiled without support for MySQL yet with support for another DBMS.
-
 === Bug fixes in 1.22.0 ===
 * (bug 47271) $wgContentHandlerUseDB should be set to false during the upgrade
 * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
@@ -482,14 +484,6 @@
   file repositories, and related ForeignAPIRepo methods getInfo and getApiUrl.
 * The new query module list=allfileusages to enumerate file usages was added.
 
-=== Languages updated in 1.22.1 ===
-* (bug 56931) Updated the plural rules to CLDR 24. They are in new format
-  which is detailed in UTS 35 Rev 33. The PHP parser and evaluator as well as
-  the JavaScript evaluator were updated to support the new format. Plural rules
-  for some languages have changed, most notably Russian. Affected software
-  messages have been updated and marked for review at translatewiki.net.
-  This change is backported from the development branch of MediaWiki 1.23.
-
 === Languages updated in 1.22.0 ===
 
 MediaWiki supports over 350 languages. Many localisations are updated
@@ -502,9 +496,6 @@
   implementation for Language::convertPlural now work correctly.
 * Batak Toba (bbc-latn) added.
 * (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian.
-
-=== Other changes in 1.22.1 ===
-* Restore compatibility with curl < 7.16.2
 
 === Other changes in 1.22.0 ===
 * redirect.php was removed. It was unused.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia48e44a33f5317f2435d65c5021714a9c0dc5806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] Fix link to article history not working properly when not us... - change (mediawiki...LastModified)

2014-01-11 Thread Hydriz (Code Review) 
Hydriz has uploaded a new change for review.

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


Change subject: Fix link to article history not working properly when not using 
short URLs
..

Fix link to article history not working properly when not using short URLs

If the wiki has short URLs enabled (i.e. /wiki/Foo), the extension
will link to the article's history page correctly. If the wiki is
using old-style URLs (i.e. /w/index.php?title=Foo), the link to the
article history will then not work (since it appends "?action=history",
resulting in a "/w/index.php?title=Foo?action=history" link.

Change-Id: I6b8433fbd969587b3a4e30c090a6b9530ac00a0c
---
M modules/lastmodified.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/lastmodified.js b/modules/lastmodified.js
index 07bda49..78388b8 100644
--- a/modules/lastmodified.js
+++ b/modules/lastmodified.js
@@ -81,7 +81,7 @@
  * @return string  Return the article title
  */
 function getArticleHistoryLink() {
-   return mw.util.wikiGetlink( mw.config.get('wgPageName') ) + 
'?action=history';
+   return mw.config.get( 'wgScript' ) + '?title=' + encodeURIComponent( 
mw.config.get( 'wgPageName' ) ) + '&action=history';
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b8433fbd969587b3a4e30c090a6b9530ac00a0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LastModified
Gerrit-Branch: master
Gerrit-Owner: Hydriz 

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

[MediaWiki-commits] [Gerrit] Scale back deployment of UniversalLanguageSelector (ULS) - change (operations/mediawiki-config)

2014-01-11 Thread MZMcBride (Code Review) 
MZMcBride has uploaded a new change for review.

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


Change subject: Scale back deployment of UniversalLanguageSelector (ULS)
..

Scale back deployment of UniversalLanguageSelector (ULS)

Only enable ULS on the phase 0 wikis. Quoting from bug 59958:
> On , UniversalLanguageSelector
> loads just under half a megabyte of fonts (490.2 Kb). By comparison, the
> combined size of all other resources -- that is, *all* javascript, CSS,
> images and text -- is 346 Kb.

Bug: 56433
Change-Id: If0ea5284a518ee81abb78400235ad7508c994760
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1ed02f4..6801870 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12471,7 +12471,10 @@
 ),
 
 'wmgUseUniversalLanguageSelector' => array(
-   'default' => true,
+   'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true,
+   'mediawikiwiki' => true,
 ),
 
 'wmgULSPosition' => array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0ea5284a518ee81abb78400235ad7508c994760
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MZMcBride 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] API: Don't check for 'globalunblock' right - change (mediawiki...GlobalBlocking)

2014-01-11 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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


Change subject: API: Don't check for 'globalunblock' right
..

API: Don't check for 'globalunblock' right

It was removed from the extension in d9a99c6bcc.

Change-Id: I55a14c43c3d85a7fc8ee86ba237602144d4e682f
---
M ApiGlobalBlock.php
1 file changed, 5 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking 
refs/changes/15/107015/1

diff --git a/ApiGlobalBlock.php b/ApiGlobalBlock.php
index 2c4afcc..8b8d1e4 100644
--- a/ApiGlobalBlock.php
+++ b/ApiGlobalBlock.php
@@ -1,15 +1,16 @@
 getUser()->isAllowed( 'globalblock' ) ) {
+   // Check permissions
+   $this->dieUsageMsg( array( 'badaccess-groups' ) );
+   }
+
$this->requireOnlyOneParameter( $this->extractRequestParams(), 
'expiry', 'unblock' );
$result = $this->getResult();
$block = GlobalBlocking::getGlobalBlockingBlock( 
$this->getParameter( 'target' ), true );
 
if ( $this->getParameter( 'expiry' ) ) {
-   if ( !$this->getUser()->isAllowed( 'globalblock' ) ) {
-   $this->dieUsageMsg( array( 'badaccess-groups' ) 
);
-   }
-
$options = array();
 
if ( $this->getParameter( 'anononly' ) ) {
@@ -48,10 +49,6 @@
$result->addValue( 'globalblock', 'expiry', 
$displayExpiry );
}
} elseif ( $this->getParameter( 'unblock' ) ) {
-   if ( !$this->getUser()->isAllowed( 'globalunblock' ) ) {
-   $this->dieUsageMsg( array( 'badaccess-groups' ) 
);
-   }
-
GlobalBlocking::getGlobalBlockingMaster()->delete(
'globalblocks',
array( 'gb_id' => $block->gb_id ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55a14c43c3d85a7fc8ee86ba237602144d4e682f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Use $this->msg instead of wfMessage - change (mediawiki...GlobalBlocking)

2014-01-11 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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


Change subject: Use $this->msg instead of wfMessage
..

Use $this->msg instead of wfMessage

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking 
refs/changes/16/107016/1

diff --git a/SpecialGlobalBlock.php b/SpecialGlobalBlock.php
index 81c2844..25de1cf 100644
--- a/SpecialGlobalBlock.php
+++ b/SpecialGlobalBlock.php
@@ -194,10 +194,10 @@
);
 
// How long to block them for
-   $dropdown = wfMessage( 'globalblocking-expiry-options' );
+   $dropdown = $this->msg( 'globalblocking-expiry-options' );
if ( $dropdown->isDisabled() ) {
// 'globalblocking-expiry-options' is empty, try the 
message from core
-   $dropdown = wfMessage( 'ipboptions' );
+   $dropdown = $this->msg( 'ipboptions' );
if ( $dropdown->isDisabled() ) {
// 'ipboptions' is empty too. Do not show a 
dropdown
// Do not assume that 'ipboptions' exists 
forever, therefore check too

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35f0bd07e82465aa845b479345be3399daf03d91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Chagned return value of self::urlFunction from array to string - change (mediawiki/core)

2014-01-11 Thread 01tonythomas (Code Review) 
01tonythomas has uploaded a new change for review.

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


Change subject: Chagned return value of self::urlFunction from array to string
..

Chagned return value of self::urlFunction from array to string

PHP Warning: htmlspecialchars() expects parameter 1 to be string,
array given in CoreParserFunctions.php on line 212
Experimental!

Bug: 59881
Change-Id: I7ae092f89b9cfbbe91d1883c2182ca5907825ba4
---
M includes/parser/CoreParserFunctions.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/107017/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 250442c..bdd563a 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -249,7 +249,7 @@
}
return $text;
} else {
-   return array( 'found' => false );
+   return false;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ae092f89b9cfbbe91d1883c2182ca5907825ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>

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

[MediaWiki-commits] [Gerrit] Validate $this->mAddress before storing it - change (mediawiki...GlobalBlocking)

2014-01-11 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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


Change subject: Validate $this->mAddress before storing it
..

Validate $this->mAddress before storing it

Bug: 58934
Change-Id: I85057ad1543ede272e9abd3b5bd034fc27a6b47a
---
M SpecialGlobalBlock.php
1 file changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking 
refs/changes/18/107018/1

diff --git a/SpecialGlobalBlock.php b/SpecialGlobalBlock.php
index 81c2844..6482b2e 100644
--- a/SpecialGlobalBlock.php
+++ b/SpecialGlobalBlock.php
@@ -98,10 +98,8 @@
function loadParameters( $par ) {
$request = $this->getRequest();
 
-   $this->mAddress = trim( $request->getText( 'wpAddress' ) );
-   if ( !$this->mAddress ) {
-   $this->mAddress = $par;
-   }
+   $address = trim( $request->getText( 'wpAddress', $par ) );
+   $this->mAddress = IP::isIPAddress( $address ) ? $address : '';
 
$this->mReason = $request->getText( 'wpReason' );
$this->mReasonList = $request->getText( 'wpBlockReasonList' );
@@ -273,9 +271,6 @@
if ( $this->mAddress ) {
$title = Title::makeTitleSafe( NS_USER, $this->mAddress 
);
 
-   if ( !$title ) {
-   return;
-   }
LogEventsList::showLogExtract(
$out,
'gblblock',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85057ad1543ede272e9abd3b5bd034fc27a6b47a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding a MediaSizeWidget - change (VisualEditor/VisualEditor)

2014-01-11 Thread Mooeypoo (Code Review) 
Mooeypoo has uploaded a new change for review.

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


Change subject: Adding a MediaSizeWidget
..

Adding a MediaSizeWidget

The widget is responsible for presenting width/height values and storing
original media size values that aspect ratio is calculated from.

Change-Id: I3d0f9348a52ac39f68dd09394778369026928c9d
---
M modules/ve/i18n/en.json
M modules/ve/i18n/qqq.json
M modules/ve/ui/styles/ve.ui.Widget.css
A modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
4 files changed, 308 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/19/107019/1

diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json
index 166bfa2..6ad8cbe 100644
--- a/modules/ve/i18n/en.json
+++ b/modules/ve/i18n/en.json
@@ -54,6 +54,10 @@
 "visualeditor-languageinspector-widget-label-langcode": "Language code",
 "visualeditor-languageinspector-widget-label-language": "Language",
 "visualeditor-linkinspector-title": "Hyperlink",
+"visualeditor-mediasizewidget-button-originalDimensions": "Set to original 
dimensions",
+"visualeditor-mediasizewidget-label-defaulterror": "Size values are 
invalid.",
+"visualeditor-mediasizewidget-label-height": "Height",
+"visualeditor-mediasizewidget-label-width": "Width",
 "visualeditor-listbutton-bullet-tooltip": "Bullet list",
 "visualeditor-listbutton-number-tooltip": "Numbered list",
 "visualeditor-specialcharacter-button-tooltip": "Special character",
@@ -61,4 +65,4 @@
 "visualeditor-specialcharinspector-characterlist-insert": 
"{\n\t\"symbols\": {\n\t\t\"−\": \"−\",\n\t\t\"—\": \"—\",\n\t\t\"°\": 
\"°\",\n\t\t\"″\": \"″\",\n\t\t\"′\": \"′\",\n\t\t\"←\": \"←\",\n\t\t\"→\": 
\"→\",\n\t\t\"·\": \"·\",\n\t\t\"§\": \"§\"\n\t},\n\t\"accents\": {\n\t\t\"à\": 
\"à\",\n\t\t\"á\": \"á\",\n\t\t\"â\": \"â\",\n\t\t\"ä\": \"ä\",\n\t\t\"ç\": 
\"ç\",\n\t\t\"è\": \"è\",\n\t\t\"é\": \"é\",\n\t\t\"ê\": \"ê\",\n\t\t\"ë\": 
\"ë\",\n\t\t\"ì\": \"ì\",\n\t\t\"í\": \"í\",\n\t\t\"î\": \"î\",\n\t\t\"ï\": 
\"ï\",\n\t\t\"ò\": \"ò\",\n\t\t\"ó\": \"ó\",\n\t\t\"ô\": \"ô\",\n\t\t\"ö\": 
\"ö\",\n\t\t\"ø\": \"ø\",\n\t\t\"ù\": \"ù\",\n\t\t\"ú\": \"ú\",\n\t\t\"û\": 
\"û\",\n\t\t\"ü\": \"ü\"\n\t},\n\t\"math\": {\n\t\t\"−\": \"−\",\n\t\t\"×\": 
\"×\",\n\t\t\"÷\": \"÷\",\n\t\t\"≈\": \"≈\",\n\t\t\"≠\": \"≠\",\n\t\t\"≤\": 
\"≤\",\n\t\t\"≥\": \"≥\",\n\t\t\"±\": \"±\"\n\t}\n}",
 "visualeditor-toolbar-insert": "Insert",
 "visualeditor-version-label": "Version"
-}
\ No newline at end of file
+}
diff --git a/modules/ve/i18n/qqq.json b/modules/ve/i18n/qqq.json
index 61e5979..bf983c1 100644
--- a/modules/ve/i18n/qqq.json
+++ b/modules/ve/i18n/qqq.json
@@ -59,9 +59,13 @@
 "visualeditor-linkinspector-title": "Title of the link inspector 
dialog.\n{{Identical|Hyperlink}}",
 "visualeditor-listbutton-bullet-tooltip": "Tooltip text for the bullet 
list button",
 "visualeditor-listbutton-number-tooltip": "Tooltip text for the numbered 
list button",
+"visualeditor-mediasizewidget-button-originalDimensions": "Label for the 
button that sets media to its original dimensions.",
+"visualeditor-mediasizewidget-label-defaulterror": "An error label 
notifying the user the size inputs are invalid.",
+"visualeditor-mediasizewidget-label-height": "Label for the height input.",
+"visualeditor-mediasizewidget-label-width": "Label for the width input.",
 "visualeditor-specialcharacter-button-tooltip": "Tooltip text for the 
insert character button.\n{{Identical|Special character}}",
 "visualeditor-specialcharacterinspector-title": "Used as title for special 
character inspector.\n{{Identical|Special character}}",
 "visualeditor-specialcharinspector-characterlist-insert": "This is a JSON 
string defining the special characters that can be inserted using the special 
character insertion tool.\n{{doc-important|Please make sure it is a valid JSON 
string.}}\n{{Optional}}",
 "visualeditor-toolbar-insert": "Label text for insert menu in 
toolbar.\n{{Identical|Insert}}",
 "visualeditor-version-label": "Label text for version 
number\n{{Identical|Version}}"
-}
\ No newline at end of file
+}
diff --git a/modules/ve/ui/styles/ve.ui.Widget.css 
b/modules/ve/ui/styles/ve.ui.Widget.css
index e70ec20..ec19a5d 100644
--- a/modules/ve/ui/styles/ve.ui.Widget.css
+++ b/modules/ve/ui/styles/ve.ui.Widget.css
@@ -114,3 +114,8 @@
 .ve-ui-groupButtonWidget {
white-space: normal;
 }
+
+/* ve.ui.MediaSizeWidget */
+.ve-ui-MediaSizeWidget-input-hasError input[type='text'] {
+   background: #ffc2c2;
+}
diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js 
b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
new file mode 100644
index 000..793441c
--- /dev/null
+++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -0,0 +1,293 @@
+/*!
+ * VisualEditor UserInterface MediaSizeWidget class.
+ *
+ * @copyright 20

<    1   2