[MediaWiki-CVS] SVN: [61740] trunk/extensions/Translate/groups/mediawiki-defines.txt

[raymond]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61740

Revision: 61740
Author:   raymond
Date: 2010-01-31 07:15:28 + (Sun, 31 Jan 2010)

Log Message:
---
Follow-up r61737: Make 'centralauth-admin-notblocked' optional for translatewiki

Modified Paths:
--
trunk/extensions/Translate/groups/mediawiki-defines.txt

Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt
===
--- trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-01-31 
02:59:26 UTC (rev 61739)
+++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-01-31 
07:15:28 UTC (rev 61740)
@@ -115,7 +115,7 @@
 
 Central Auth
 aliasfile = CentralAuth/CentralAuth.alias.php
-optional = centralauth-editset-grouplink
+optional = centralauth-editset-grouplink, centralauth-admin-notblocked
 
 Central Notice
 



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

[MediaWiki-CVS] SVN: [61739] trunk/extensions/Maps/Maps_Settings.php

[jeroendedauw]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61739

Revision: 61739
Author:   jeroendedauw
Date: 2010-01-31 02:59:26 + (Sun, 31 Jan 2010)

Log Message:
---
Small setting value change.

Modified Paths:
--
trunk/extensions/Maps/Maps_Settings.php

Modified: trunk/extensions/Maps/Maps_Settings.php
===
--- trunk/extensions/Maps/Maps_Settings.php 2010-01-31 02:59:01 UTC (rev 
61738)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-01-31 02:59:26 UTC (rev 
61739)
@@ -131,8 +131,8 @@
 # Array. The minimum and maximum width and height for all maps. First min, 
then max. Min needs to be smaller then max.
 # When the height or width exceed their limits, they will be changed to the 
closest allowed value.
 $egMapsSizeRestrictions = array(
-   'width'  => array( 100, 1000 ),
-   'height' => array( 0, 1000 ),
+   'width'  => array( 50, 1020 ),
+   'height' => array( 50, 1000 ),
 );
 
 # Strings. The default coordinates for the map. Must be in floating point 
notation.



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

[MediaWiki-CVS] SVN: [61738] trunk/extensions/Validator

[jeroendedauw]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61738

Revision: 61738
Author:   jeroendedauw
Date: 2010-01-31 02:59:01 + (Sun, 31 Jan 2010)

Log Message:
---
0.2.1 rc1

Modified Paths:
--
trunk/extensions/Validator/Validator.php
trunk/extensions/Validator/Validator_Functions.php

Modified: trunk/extensions/Validator/Validator.php
===
--- trunk/extensions/Validator/Validator.php2010-01-31 02:41:55 UTC (rev 
61737)
+++ trunk/extensions/Validator/Validator.php2010-01-31 02:59:01 UTC (rev 
61738)
@@ -24,7 +24,7 @@
die( 'Not an entry point.' );
 }
 
-define( 'Validator_VERSION', '0.2.1 a1' );
+define( 'Validator_VERSION', '0.2.1 rc1' );
 
 // Constants indicating the strictness of the parameter validation.
 define( 'Validator_ERRORS_NONE', 0 );

Modified: trunk/extensions/Validator/Validator_Functions.php
===
--- trunk/extensions/Validator/Validator_Functions.php  2010-01-31 02:41:55 UTC 
(rev 61737)
+++ trunk/extensions/Validator/Validator_Functions.php  2010-01-31 02:59:01 UTC 
(rev 61738)
@@ -23,7 +23,7 @@
 final class ValidatorFunctions {
 
/**
-* Returns whether the provided value, which must be a number, is 
within a certain range. Upper bound not included.
+* Returns whether the provided value, which must be a number, is 
within a certain range. Upper bound included.
 *
 * @param $value
 * @param $lower
@@ -35,7 +35,7 @@
if ( ! is_numeric( $value ) ) return false;
$value = (int)$value;
if ($lower !== false && $value < $lower) return false;
-   if ($upper !== false && $value >= $upper) return false;
+   if ($upper !== false && $value > $upper) return false;
return true;
}
 
@@ -76,7 +76,7 @@
}   

/**
-* Returns whether the length of the value is within a certain range. 
Upper bound not included.
+* Returns whether the length of the value is within a certain range. 
Upper bound included.
 * 
 * @param string $value
 * @param $lower
@@ -89,7 +89,7 @@
}

/**
-* Returns whether the amount of items in the list is within a certain 
range. Upper bound not included.
+* Returns whether the amount of items in the list is within a certain 
range. Upper bound included.
 * 
 * @param array $values
 * @param $lower



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

[MediaWiki-CVS] SVN: [61736] trunk/debs/squid/debian

[tstarling]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61736

Revision: 61736
Author:   tstarling
Date: 2010-01-31 02:14:25 + (Sun, 31 Jan 2010)

Log Message:
---
English-only version of the squid error message, with other assorted space 
saving changes.

Modified Paths:
--
trunk/debs/squid/debian/changelog

Added Paths:
---
trunk/debs/squid/debian/errors/error-en.html

Modified: trunk/debs/squid/debian/changelog
===
--- trunk/debs/squid/debian/changelog   2010-01-31 01:16:55 UTC (rev 61735)
+++ trunk/debs/squid/debian/changelog   2010-01-31 02:14:25 UTC (rev 61736)
@@ -1,3 +1,9 @@
+squid (2.7.6-1wm2) hardy; urgency=low
+
+  * Added error-en.html 
+
+ -- Tim Starling   Sun, 31 Jan 2010 13:11:13 +1100
+
 squid (2.7.6-1wm1) hardy; urgency=low
 
   * New upstream release

Added: trunk/debs/squid/debian/errors/error-en.html
===
--- trunk/debs/squid/debian/errors/error-en.html
(rev 0)
+++ trunk/debs/squid/debian/errors/error-en.html2010-01-31 02:14:25 UTC 
(rev 61736)
@@ -0,0 +1,97 @@
+
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+Wikimedia Error
+
+
+http://www.gnu.org/licenses/fdl.txt"/>
+
+
+
+
+   function lines(s) {
+   var c = s.split(' ');
+   for (var i = 0; i < c.length; i++) {
+   document.write('
');
+   }
+   }
+
+
+
+
+Wikimedia Foundation
+lines('ccd4cf bdc3bf adb1af 9ea09f dbe5df');
+
+Error
+
+lines('8f8f8f acacac c6c6c6 dbdbdb eaeaea f4f4f4');
+
+
+
+
+
+Our servers are currently experiencing a technical problem. This is 
probably temporary and should be fixed soon. Please try again in a few 
minutes.
+You may be able to get further information in the #wikipedia channel on the http://www.freenode.net";>Freenode IRC network.
+The Wikimedia Foundation is a non-profit organisation which hosts some of 
the most popular sites on the Internet, including Wikipedia. It has a constant 
need to purchase new hardware. If you would like to help, please http://wikimediafoundation.org/wiki/Fundraising";>donate.
+
+
+If you report this error to the Wikimedia System Administrators, please 
include the details below.
+
+
+
+Request: %M %U, from %i via %h (%s) to %H (%I)
+Error: %c, errno %E at %T
+
+
+
+
+
+lines('9ea09f adb1af bdc3bf ccd4cf');
+
+
+
+



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

[MediaWiki-CVS] SVN: [61735] trunk/phase3/includes/specials/SpecialBlockip.php

[vasilievvv]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61735

Revision: 61735
Author:   vasilievvv
Date: 2010-01-31 01:16:55 + (Sun, 31 Jan 2010)

Log Message:
---
Modify IPBlockForm::(un)suppressUserName so it can be used on a different 
database.

Modified Paths:
--
trunk/phase3/includes/specials/SpecialBlockip.php

Modified: trunk/phase3/includes/specials/SpecialBlockip.php
===
--- trunk/phase3/includes/specials/SpecialBlockip.php   2010-01-30 23:39:43 UTC 
(rev 61734)
+++ trunk/phase3/includes/specials/SpecialBlockip.php   2010-01-31 01:16:55 UTC 
(rev 61735)
@@ -539,19 +539,20 @@
}
}
 
-   public static function suppressUserName( $name, $userId ) {
+   public static function suppressUserName( $name, $userId, $dbw = null ) {
$op = '|'; // bitwise OR
-   return self::setUsernameBitfields( $name, $userId, $op );
+   return self::setUsernameBitfields( $name, $userId, $op, $dbw );
}
 
-   public static function unsuppressUserName( $name, $userId ) {
+   public static function unsuppressUserName( $name, $userId, $dbw = null 
) {
$op = '&'; // bitwise AND
-   return self::setUsernameBitfields( $name, $userId, $op );
+   return self::setUsernameBitfields( $name, $userId, $op, $dbw );
}
 
-   private static function setUsernameBitfields( $name, $userId, $op ) {
+   private static function setUsernameBitfields( $name, $userId, $op, $dbw 
) {
if( $op !== '|' && $op !== '&' ) return false; // sanity check
-   $dbw = wfGetDB( DB_MASTER );
+   if( !$dbw )
+   $dbw = wfGetDB( DB_MASTER );
$delUser = Revision::DELETED_USER | 
Revision::DELETED_RESTRICTED;
$delAction = LogPage::DELETED_ACTION | 
Revision::DELETED_RESTRICTED;
# Normalize user name



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

[MediaWiki-CVS] SVN: [61734] trunk/extensions/cldr/LocalNamesEn.php

[siebrand]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61734

Revision: 61734
Author:   siebrand
Date: 2010-01-30 23:39:43 + (Sat, 30 Jan 2010)

Log Message:
---
Add vmf

Modified Paths:
--
trunk/extensions/cldr/LocalNamesEn.php

Modified: trunk/extensions/cldr/LocalNamesEn.php
===
--- trunk/extensions/cldr/LocalNamesEn.php  2010-01-30 23:34:31 UTC (rev 
61733)
+++ trunk/extensions/cldr/LocalNamesEn.php  2010-01-30 23:39:43 UTC (rev 
61734)
@@ -255,13 +255,18 @@
  */
 'tcy'=> 'Tulu',
 
-
 /* Not in CLDR 1.7.1. Finnic Uralic language.
  * http://www.ethnologue.org/show_language.asp?code=vep
  * Added 2009-01-24.
  */
 'vep'=> 'Veps',
 
+/* Not in CLDR 1.7.1. West Middle German language.
+ * http://www.sil.org/iso639-3/documentation.asp?id=vmf
+ * Added 2010-01-31.
+ */
+'vmf'=> 'Upper Franconian',
+
 /* Not in CLDR 1.7.1. Estonian language.
  * http://www.sil.org/iso639-3/documentation.asp?id=vro
  * Added 2009-01-24.



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

[MediaWiki-CVS] SVN: [61733] trunk/phase3/languages/messages/MessagesVmf.php

[siebrand]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61733

Revision: 61733
Author:   siebrand
Date: 2010-01-30 23:34:31 + (Sat, 30 Jan 2010)

Log Message:
---
Localisation updates for core messages from translatewiki.net
* update namespace names and special page aliases for Upper Franconian
* remove trailing whitespace

Modified Paths:
--
trunk/phase3/languages/messages/MessagesVmf.php

Modified: trunk/phase3/languages/messages/MessagesVmf.php
===
--- trunk/phase3/languages/messages/MessagesVmf.php 2010-01-30 23:31:22 UTC 
(rev 61732)
+++ trunk/phase3/languages/messages/MessagesVmf.php 2010-01-30 23:34:31 UTC 
(rev 61733)
@@ -11,6 +11,52 @@
  * @author Silvicola
  */
 
+$fallback = 'de';
+
+$namespaceNames = array(
+   NS_MEDIA=> 'Media',
+   NS_SPECIAL  => 'Schbädsjaal',
+   NS_TALK => 'Disghusjoon',
+   NS_USER => 'Bänudsâr',
+   NS_USER_TALK=> 'Bänudsârdisghusjoon',
+   NS_PROJECT_TALK => '$1disghusjoon',
+   NS_FILE => 'Dôdaj',
+   NS_FILE_TALK=> 'Dôdajdisghusjoon',
+   NS_MEDIAWIKI=> 'Meedjawigi',
+   NS_MEDIAWIKI_TALK   => 'Meedjawigidisghusjoon',
+   NS_TEMPLATE => 'Foorlaachâ',
+   NS_TEMPLATE_TALK=> 'Foorlaachândisghusjoon',
+   NS_HELP => 'Hilwâ',
+   NS_HELP_TALK=> 'Hilwâdisghusjoon',
+   NS_CATEGORY => 'Gadâgorii',
+   NS_CATEGORY_TALK=> 'Gadâgoriidisghusjoon',
+);
+
+$specialPageAliases = array(
+   'DoubleRedirects'   => array( 'Dobâldâ Wajdârlajdungân' ),
+   'Userlogin' => array( 'Ôômäldâ' ),
+   'Userlogout'=> array( 'Ôbmäldâ' ),
+   'Preferences'   => array( 'Ôischtälungâ' ),
+   'Watchlist' => array( 'Bäoobôchdungslisdâ' ),
+   'Recentchanges' => array( 'Lädsdâ Änârungâ' ),
+   'Upload'=> array( 'Hoochlaadâ' ),
+   'Statistics'=> array( 'Schdadisdign' ),
+   'Newpages'  => array( 'Nojâ Sajdâ' ),
+   'Allpages'  => array( 'Ôlâ Sajdâ' ),
+   'Prefixindex'   => array( 'Indägs' ),
+   'Specialpages'  => array( 'Schbädsjaalsajdâ' ),
+   'Contributions' => array( 'Bajdräächâ' ),
+   'Emailuser' => array( 'Iimäjlâ' ),
+   'Confirmemail'  => array( 'Iimäjl bschdädigâ' ),
+   'Movepage'  => array( 'Sajdâ färschiibâ' ),
+   'Categories'=> array( 'Gadâgoriin' ),
+   'Export'=> array( 'Ägsbordiirn' ),
+   'Allmessages'   => array( 'Ôlâ Nôôchrichdâ' ),
+   'Undelete'  => array( 'Wiidârhärschdälâ' ),
+   'Import'=> array( 'Imbordiirn' ),
+   'Unwatchedpages'=> array( 'Unbäoobôchdâdâ Sajdn' ),
+);
+
 $messages = array(
 # User preference toggles
 'tog-underline'  => 'Linggs undârschdrajchn:',
@@ -260,7 +306,7 @@
 
 # Main script and global functions
 'nosuchaction'  => 'Des schded ned dsur auswaal',
-'nosuchactiontext'  => "Di agdsjoon, dii in dr URL schdäd, ged ned. 
+'nosuchactiontext'  => "Di agdsjoon, dii in dr URL schdäd, ged ned.
 Filajchd is di URL falsch gschriiwn, odr duu bisch âm falschn lingg nôôch.
 S'ghend aa â brogramiirfäälâr in dr sofdwäâr sâj, dii baj {{SITENAME}} lefd.",
 'nosuchspecialpage' => "Dii sôndâr-sajdn gajd's ned",
@@ -289,7 +335,7 @@
 Gschbärd is se desdâweechn: $1",
 'missing-article' => "Di daadnbangg had dii sajdn „$1“ $2 ned gfundn.
 
-Wen des basiird, dan majschdns, wemma â dsu alde bearbajdung ôôgugn wil oda 
ane fonra gleschdn sajdn.  
+Wen des basiird, dan majschdns, wemma â dsu alde bearbajdung ôôgugn wil oda 
ane fonra gleschdn sajdn.
 
 Wen's des ned is, bisd womeeglich iwa ân feela in dr sofdwäâr gschdolbad. Dan 
meld des, bide mid da URL, am [[Special:ListUsers/sysop|Administrator]].",
 'viewsource'  => 'Gwäl-dhägsd ôôgugn',
@@ -312,7 +358,7 @@
 'savearticle'=> 'Sajdn schbajchän',
 'summary-preview'=> "Was in'd dsusammfasungsdsajln najghumd:",
 'noarticletext'  => 'Dii sajdn gibd\'s bis jeds noch ned.
-Duu ghâusch nach dem ausdrug aa [[Special:Search/{{PAGENAME}}|in aln sajdn 
drin suuchn]], 
+Duu ghâusch nach dem ausdrug aa [[Special:Search/{{PAGENAME}}|in aln sajdn 
drin suuchn]],
  [{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE 
in deen dsugheerichn log-biichârn suuchn] odâr dii sajdn 
[{{fullurl:{{FULLPAGENAME}}|action=edit}} ôôleechn un najschrajwn].',
 'template-semiprotected' => '(ned ôôgmeldede un naje benudsr däfn hiir ned 
schrajm)',
 
@@ -638,10 +684,10 @@
 'modern.css'  => "/* CSS hiir beâjflusd nôr dii Modern-schelfn. Wen'd ale 
uf ôômôôl beâjflusn wilsch, muâsch an MediaWiki:Common.css was ändâr

[MediaWiki-CVS] SVN: [61731] trunk/phase3/RELEASE-NOTES

[reedy]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61731

Revision: 61731
Author:   reedy
Date: 2010-01-30 22:57:18 + (Sat, 30 Jan 2010)

Log Message:
---
RELEASE-NOTES for r61730 after 
https://bugzilla.wikimedia.org/show_bug.cgi?id=18758#c4

* (bug 18758) API read of watchlist's wl_notificationtimestamp

Modified Paths:
--
trunk/phase3/RELEASE-NOTES

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-01-30 22:48:54 UTC (rev 61730)
+++ trunk/phase3/RELEASE-NOTES  2010-01-30 22:57:18 UTC (rev 61731)
@@ -810,6 +810,7 @@
 * Support key-params arrays in 'descriptionmsg' in 
meta=siteinfo&siprop=extensions
 * (bug 21922) YAML output should quote asterisk when used as key
 * (bug 22297) safesubst: to allow substitution without breaking transclusion
+* (bug 18758) API read of watchlist's wl_notificationtimestamp
 
 === Languages updated in 1.16 ===
 



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

[MediaWiki-CVS] SVN: [61730] trunk/phase3/includes/api/ApiQueryWatchlist.php

[reedy]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61730

Revision: 61730
Author:   reedy
Date: 2010-01-30 22:48:54 + (Sat, 30 Jan 2010)

Log Message:
---
Start of implementation of bug 18758 - Get value of wl_notificationtimestamp

Modified Paths:
--
trunk/phase3/includes/api/ApiQueryWatchlist.php

Modified: trunk/phase3/includes/api/ApiQueryWatchlist.php
===
--- trunk/phase3/includes/api/ApiQueryWatchlist.php 2010-01-30 22:00:34 UTC 
(rev 61729)
+++ trunk/phase3/includes/api/ApiQueryWatchlist.php 2010-01-30 22:48:54 UTC 
(rev 61730)
@@ -49,7 +49,8 @@
}
 
private $fld_ids = false, $fld_title = false, $fld_patrol = false, 
$fld_flags = false,
-   $fld_timestamp = false, $fld_user = false, $fld_comment 
= false, $fld_sizes = false;
+   $fld_timestamp = false, $fld_user = false, $fld_comment 
= false, $fld_sizes = false,
+   $fld_notificationtimestamp = false;
 
private function run( $resultPageSet = null ) {
global $wgUser;
@@ -85,6 +86,7 @@
$this->fld_timestamp = isset( $prop['timestamp'] );
$this->fld_sizes = isset( $prop['sizes'] );
$this->fld_patrol = isset( $prop['patrol'] );
+   $this->fld_notificationtimestamp = isset( 
$prop['notificationtimestamp'] );
 
if ( $this->fld_patrol ) {
if ( !$user->useRCPatrol() && 
!$user->useNPPatrol() )
@@ -113,6 +115,7 @@
$this->addFieldsIf( 'rc_patrolled', $this->fld_patrol );
$this->addFieldsIf( 'rc_old_len', $this->fld_sizes );
$this->addFieldsIf( 'rc_new_len', $this->fld_sizes );
+   $this->addFieldsIf( 'wl_notificationtimestamp', 
$this->fld_notificationtimestamp );
} elseif ( $params['allrev'] ) {
$this->addFields( 'rc_this_oldid' );
} else {
@@ -257,6 +260,9 @@
$vals['oldlen'] = intval( $row->rc_old_len );
$vals['newlen'] = intval( $row->rc_new_len );
}
+   
+   if ( $this->fld_notificationtimestamp )
+   $vals['notificationtimestamp'] = ( 
$row->wl_notificationtimestamp == null ) ? '' : wfTimestamp( TS_ISO_8601, 
$row->wl_notificationtimestamp);
 
if ( $this->fld_comment && isset( $row->rc_comment ) )
$vals['comment'] = $row->rc_comment;
@@ -309,6 +315,7 @@
'timestamp',
'patrol',
'sizes',
+   'notificationtimestamp'
)
),
'show' => array (



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

[MediaWiki-CVS] SVN: [61729] trunk/phase3/languages/messages/MessagesEn.php

[churchofemacs]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61729

Revision: 61729
Author:   churchofemacs
Date: 2010-01-30 22:00:34 + (Sat, 30 Jan 2010)

Log Message:
---
fixing r61124: typos

Modified Paths:
--
trunk/phase3/languages/messages/MessagesEn.php

Modified: trunk/phase3/languages/messages/MessagesEn.php
===
--- trunk/phase3/languages/messages/MessagesEn.php  2010-01-30 20:26:38 UTC 
(rev 61728)
+++ trunk/phase3/languages/messages/MessagesEn.php  2010-01-30 22:00:34 UTC 
(rev 61729)
@@ -1328,12 +1328,12 @@
 
 The administrator who locked it offered this explanation: $1",
 'protectedpagewarning' => "'''Warning: This page has been locked 
so that only users with administrator privileges can edit it.'''
-The lastest log entry is provided below for reference:",
+The latest log entry is provided below for reference:",
 'semiprotectedpagewarning' => "'''Note:''' This page has been locked 
so that only registered users can edit it.
-The lastest log entry is provided below for reference:",
+The latest log entry is provided below for reference:",
 'cascadeprotectedwarning'  => "'''Warning:''' This page has been 
locked so that only users with administrator privileges can edit it, because it 
is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
 'titleprotectedwarning'=> "'''Warning: This page has been locked 
so that [[Special:ListGroupRights|specific rights]] are needed to create it.'''
-The lastest log entry is provided below for reference:",
+The latest log entry is provided below for reference:",
 'templatesused'=> '{{PLURAL:$1|Template|Templates}} used 
on this page:',
 'templatesusedpreview' => '{{PLURAL:$1|Template|Templates}} used 
in this preview:',
 'templatesusedsection' => '{{PLURAL:$1|Template|Templates}} used 
in this section:',
@@ -3088,9 +3088,9 @@
 'fix-double-redirects' => 'Update any redirects that point to the 
original title',
 'move-leave-redirect'  => 'Leave a redirect behind',
 'protectedpagemovewarning' => "'''Warning:''' This page has been locked so 
that only users with administrator privileges can move it.
-The lastest log entry is provided below for reference:",
+The latest log entry is provided below for reference:",
 'semiprotectedpagemovewarning' => "'''Note:''' This page has been locked so 
that only registered users can move it.
-The lastest log entry is provided below for reference:",
+The latest log entry is provided below for reference:",
 'move-over-sharedrepo' => '== File exists ==
 [[:$1]] exists on a shared repository. Moving a file to this title will 
override the shared file.',
 'file-exists-sharedrepo'   => 'The file name chosen is already in use on a 
shared repository.



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

[MediaWiki-CVS] SVN: [61728] trunk/phase3/skins/MonoBook.php

[ashley]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61728

Revision: 61728
Author:   ashley
Date: 2010-01-30 20:26:38 + (Sat, 30 Jan 2010)

Log Message:
---
MonoBook: remove three unused globals which were added in r56770 to support 
loading of IEFixes.js but IEFixes.js was merged into wikibits.js in r60994

Modified Paths:
--
trunk/phase3/skins/MonoBook.php

Modified: trunk/phase3/skins/MonoBook.php
===
--- trunk/phase3/skins/MonoBook.php 2010-01-30 19:20:23 UTC (rev 61727)
+++ trunk/phase3/skins/MonoBook.php 2010-01-30 20:26:38 UTC (rev 61728)
@@ -24,7 +24,7 @@
$template = 'MonoBookTemplate', $useHeadElement = true;
 
function setupSkinUserCss( OutputPage $out ) {
-   global $wgHandheldStyle, $wgStyleVersion, $wgJsMimeType, 
$wgStylePath;
+   global $wgHandheldStyle;
 
parent::setupSkinUserCss( $out );
 



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

[MediaWiki-CVS] SVN: [61726] trunk/extensions/LocalisationUpdate/LocalisationUpdate.i18n. php

[platonides]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61726

Revision: 61726
Author:   platonides
Date: 2010-01-30 18:47:55 + (Sat, 30 Jan 2010)

Log Message:
---
Update es: extension description.

Modified Paths:
--
trunk/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php

Modified: trunk/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php
===
--- trunk/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php 
2010-01-30 17:55:49 UTC (rev 61725)
+++ trunk/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php 
2010-01-30 18:47:55 UTC (rev 61726)
@@ -125,7 +125,7 @@
  * @author Crazymadlover
  */
 $messages['es'] = array(
-   'localisationupdate-desc' => 'Mantener los mensajes localizados tan 
actualizados como sean posibles',
+   'localisationupdate-desc' => 'Mantiene los mensajes localizados tan 
actualizados como sea posible',
 );
 
 /** Estonian (Eesti)



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

[MediaWiki-CVS] SVN: [61725] trunk/extensions/SemanticMaps/SemanticMaps.php

[jeroendedauw]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61725

Revision: 61725
Author:   jeroendedauw
Date: 2010-01-30 17:55:49 + (Sat, 30 Jan 2010)

Log Message:
---
Changes for 0.5.3.

Modified Paths:
--
trunk/extensions/SemanticMaps/SemanticMaps.php

Modified: trunk/extensions/SemanticMaps/SemanticMaps.php
===
--- trunk/extensions/SemanticMaps/SemanticMaps.php  2010-01-30 17:55:43 UTC 
(rev 61724)
+++ trunk/extensions/SemanticMaps/SemanticMaps.php  2010-01-30 17:55:49 UTC 
(rev 61725)
@@ -35,7 +35,7 @@
 
 // Only initialize the extension when all dependencies are present.
 if (defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' )) {
-   define('SM_VERSION', '0.5.3 a5');
+   define('SM_VERSION', '0.5.3 rc1');

$smgScriptPath  = $wgScriptPath . '/extensions/SemanticMaps';
$smgIP  = $IP . '/extensions/SemanticMaps';



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

[MediaWiki-CVS] SVN: [61724] trunk/extensions/Maps

[jeroendedauw]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61724

Revision: 61724
Author:   jeroendedauw
Date: 2010-01-30 17:55:43 + (Sat, 30 Jan 2010)

Log Message:
---
Changes for 0.5.3.
* Added 2nd level service defaulting
* Fixed Google Maps v3 features

Modified Paths:
--
trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php
trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php
trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/Maps_Mapper.php
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/ParserFunctions/Maps_ParserFunctions.php

Modified: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php
===
--- trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php  2010-01-30 
17:48:41 UTC (rev 61723)
+++ trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php  2010-01-30 
17:55:43 UTC (rev 61724)
@@ -22,7 +22,7 @@
 
 $egMapsServices['googlemaps3'] = array(
'pf' => 
array(
-   
'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' => 
'GoogleMaps3/Maps_GoogleMaps3DispPoint.php', 'local' => true),
+   
//'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' => 
'GoogleMaps3/Maps_GoogleMaps3DispPoint.php', 'local' => true),

'display_map' => array('class' => 'MapsGoogleMaps3DispMap', 'file' => 
'GoogleMaps3/Maps_GoogleMaps3DispMap.php', 'local' => true),

),

'classes' => array(

Modified: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php
===
--- trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php   
2010-01-30 17:48:41 UTC (rev 61723)
+++ trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php   
2010-01-30 17:55:43 UTC (rev 61724)
@@ -66,7 +66,7 @@
zoom: $this->zoom,
lat: $this->centre_lat,
lon: $this->centre_lon, 
-   types: [$this->types],
+   types: [],
mapTypeId: $this->type
},
[]

Modified: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
===
--- trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php 
2010-01-30 17:48:41 UTC (rev 61723)
+++ trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php 
2010-01-30 17:55:43 UTC (rev 61724)
@@ -69,7 +69,7 @@
zoom: $this->zoom,
lat: $this->centre_lat,
lon: $this->centre_lon, 
-   types: [$this->types],
+   types: [],
mapTypeId: $this->type
},
[$this->markerString]

Modified: trunk/extensions/Maps/Maps.php
===
--- trunk/extensions/Maps/Maps.php  2010-01-30 17:48:41 UTC (rev 61723)
+++ trunk/extensions/Maps/Maps.php  2010-01-30 17:55:43 UTC (rev 61724)
@@ -33,7 +33,7 @@
echo 'Warning: You need to have http://www.mediawiki.org/wiki/Extension:Validator";>Validator 
installed in order to use http://www.mediawiki.org/wiki/Extension:Maps";>Maps.';
 }
 else {
-   define('Maps_VERSION', '0.5.3 a5');
+   define('Maps_VERSION', '0.5.3 rc1');

$egMapsScriptPath   = $wgScriptPath . '/extensions/Maps';
$egMapsIP   = $IP . '/extensions/Maps';

Modified: trunk/extensions/Maps/Maps_Mapper.php
===
--- trunk/extensions/Maps/Maps_Mapper.php   2010-01-30 17:48:41 UTC (rev 
61723)
+++ trunk/extensions/Maps/Maps_Mapper.php   2010-01-30 17:55:43 UTC (rev 
61724)
@@ -68,19 +68,42 @@
 *
 * @param string $service
 * @param string $feature
+* @param string $subfeature
 * 
 * @return string
 */
-   public static function getValidService($service, $feature) {
+   public static function getValidService($service, $feature, $subfeature 
= '') {
global $egMapsAvailableServices, $egMapsDefaultService, 
$egMapsDefaultServices, $egMapsServices;

$service = self::getMainServiceName($service);

$shouldChange = ! array_key_exists($service, $

[MediaWiki-CVS] SVN: [61723] branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw. BaseUploadInterface.js

[dale]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61723

Revision: 61723
Author:   dale
Date: 2010-01-30 17:48:41 + (Sat, 30 Jan 2010)

Log Message:
---
bug 22320 ~ IE seems to error out when you update the "action" of a form. But 
when put it into a try catch it  proceeds happy. ~who knows~

Modified Paths:
--

branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js

Modified: 
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js
===
--- 
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js  
2010-01-30 17:40:17 UTC (rev 61722)
+++ 
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/mw.BaseUploadInterface.js  
2010-01-30 17:48:41 UTC (rev 61723)
@@ -179,7 +179,6 @@
 
// FIXME: move this to configuration and avoid this API 
request
mw.getJSON( _this.api_url, { 'action' : 'paraminfo', 
'modules' : 'upload' }, function( data ) {
-   debugger; 
if ( typeof data.paraminfo == 
'undefined'
|| typeof 
data.paraminfo.modules == 'undefined' )
{
@@ -250,7 +249,11 @@
var $form = $j( this.form_selector );   
 
// Set the form action
-   $form.attr('action', _this.api_url);
+   try{
+   $form.attr('action', _this.api_url);
+   }catch(e){
+   mw.log("IE for some reason error's out when you change 
the action")
+   }
 
// Add API action
if ( $form.find( "[name='action']" ).length == 0 ){
@@ -304,32 +307,35 @@
$j( '#upProgressDialog' ).html( 
mw.loading_spinner()
);  
-   
+
// Add the iframe
_this.iframeId = 'f_' + ( $j( 'iframe' ).length + 1 );
-   $j( "body" ).append( '' );
+   $j( "body" ).append( 
+   $j('')
+   .attr({
+   'src':'javascript:false;',
+   'id':_this.iframeId,
+   'name':  _this.iframeId
+   }) 
+   .css('display', 'none')
+   );
 
+
// Set the form target to the iframe
$form.attr( 'target', _this.iframeId );
+   
 
// Set up the completion callback
$j( '#' + _this.iframeId ).load( function() {
_this.processIframeResult( $j( this ).get( 0 ) );
-   });
-
-   // Set the action to the API URL:
-   $form.attr( 'action', _this.api_url );
-
-   mw.log( 'Do iframe form submit of: ' +  $form.attr( 'target' )  
+ ' to: ' + $form.attr('action') );
-   mw.log( ' destName:' + $form.find( "[name='filename']" ).val() 
);
-   mw.log( ' content:' + $form.find( "[name='comment']" ).val() );
-
+   }); 
+   
// Do post override
_this.form_post_override = true;

// Reset the done with action flag
_this.action_done = false;  
+   mw.log("about to submit form:");
$form.submit();
},
 
@@ -978,17 +984,26 @@
// Add the wpDestFile-warning row
if ( $j( '#wpDestFile-warning' ).length == 0 ) {
$j( '#mw-htmlform-options tr:last' )
-   .after( '' );
+   .after( 
+   $j('' )
+   .append( '' )
+   .append( '' )
+   .attr('id', 'wpDestFile-warning')
+   );
}
-
+   mw.log( 'past dest');
// Remove any existing warning
$j( opt.warn_target ).empty();
-
+   mw.log( 'past remove warn:: ' +  _this.selector);
// Show the AJAX spinner
-   $j( _this.selector )
-   .append( '' );
-   
+   $j( _this.selector ).after( 
+   $j('')
+   .attr({
+   'id' : "mw-spinner-wpDestFile",
+   'src' : stylepath + 
'/common/images/spinner.gif' 
+   })
+   );  
+   mw.log("added spiner"); 
var request =  {
'titles': 'File:' + $j( _this

[MediaWiki-CVS] SVN: [61722] trunk/phase3/includes/OutputPage.php

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61722

Revision: 61722
Author:   ialex
Date: 2010-01-30 17:40:17 + (Sat, 30 Jan 2010)

Log Message:
---
Per Nikerabbit, follow-up to r61690: document $interface parameter

Modified Paths:
--
trunk/phase3/includes/OutputPage.php

Modified: trunk/phase3/includes/OutputPage.php
===
--- trunk/phase3/includes/OutputPage.php2010-01-30 16:46:03 UTC (rev 
61721)
+++ trunk/phase3/includes/OutputPage.php2010-01-30 17:40:17 UTC (rev 
61722)
@@ -1133,7 +1133,9 @@
 *
 * @param $text String
 * @param $linestart Boolean: is this the start of a line?
-* @param $interface Boolean: ??
+* @param $interface Boolean: use interface language ($wgLang instead of
+*   $wgContLang) while parsing language sensitive magic
+*   words like GRAMMAR and PLURAL
 * @return String: HTML
 */
public function parse( $text, $linestart = true, $interface = false ) {
@@ -1154,7 +1156,9 @@
 *
 * @param $text String
 * @param $linestart Boolean: is this the start of a line?
-* @param $interface Boolean: ??
+* @param $interface Boolean: use interface language ($wgLang instead of
+*   $wgContLang) while parsing language sensitive magic
+*   words like GRAMMAR and PLURAL
 * @return String: HTML
 */
public function parseInline( $text, $linestart = true, $interface = 
false ) {
@@ -1311,7 +1315,7 @@
 
/**
 * bug 21672: Add Accept-Language to Vary and XVO headers
-*if there's no 'variant' parameter existed in GET.
+* if there's no 'variant' parameter existed in GET.
 *
 * For example:
 *   /w/index.php?title=Main_page should always be served; but



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

[MediaWiki-CVS] SVN: [61721] branches/wmf-deployment/skins/common/edit.js

[catrope]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61721

Revision: 61721
Author:   catrope
Date: 2010-01-30 16:46:03 + (Sat, 30 Jan 2010)

Log Message:
---
wmf-deployment: Merge r59919 (fix JS error in edit.js) from trunk

Modified Paths:
--
branches/wmf-deployment/skins/common/edit.js

Property Changed:

branches/wmf-deployment/skins/common/edit.js

Modified: branches/wmf-deployment/skins/common/edit.js
===
--- branches/wmf-deployment/skins/common/edit.js2010-01-30 16:20:54 UTC 
(rev 61720)
+++ branches/wmf-deployment/skins/common/edit.js2010-01-30 16:46:03 UTC 
(rev 61721)
@@ -30,7 +30,7 @@
image.onclick = function() {
insertTags(item.tagOpen, item.tagClose, item.sampleText);
//click tracking
-   if ( ( $j != undefined )  &&  ( $j.trackAction != undefined ) ) 
{
+   if ( ( typeof $j != 'undefined' )  &&  ( typeof $j.trackAction 
!= 'undefined' ) ) {
$j.trackAction("oldedit." + item.speedTip.replace(/ /g, 
"-"));
}
return false;


Property changes on: branches/wmf-deployment/skins/common/edit.js
___
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/skins/common/edit.js:51646
/trunk/phase3/skins/common/edit.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59604,61557-61558
   + /branches/REL1_15/phase3/skins/common/edit.js:51646
/trunk/phase3/skins/common/edit.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59604,59939,61557-61558



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

[MediaWiki-CVS] SVN: [61720] trunk/phase3/includes/User.php

[demon]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61720

Revision: 61720
Author:   demon
Date: 2010-01-30 16:20:54 + (Sat, 30 Jan 2010)

Log Message:
---
Check $this not $wgUser in canSendEmail()

Modified Paths:
--
trunk/phase3/includes/User.php

Modified: trunk/phase3/includes/User.php
===
--- trunk/phase3/includes/User.php  2010-01-30 15:55:06 UTC (rev 61719)
+++ trunk/phase3/includes/User.php  2010-01-30 16:20:54 UTC (rev 61720)
@@ -3059,8 +3059,8 @@
 * @return \bool True if allowed
 */
function canSendEmail() {
-   global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
-   if( !$wgEnableEmail || !$wgEnableUserEmail || 
!$wgUser->isAllowed( 'sendemail' ) ) {
+   global $wgEnableEmail, $wgEnableUserEmail;
+   if( !$wgEnableEmail || !$wgEnableUserEmail || 
!$this->isAllowed( 'sendemail' ) ) {
return false;
}
$canSend = $this->isEmailConfirmed();



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

[MediaWiki-CVS] SVN: [61719] trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61719

Revision: 61719
Author:   ialex
Date: 2010-01-30 15:55:06 + (Sat, 30 Jan 2010)

Log Message:
---
Fix typo in 'top-fans-by-category-title-gifts-rec-count'

Modified Paths:
--
trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php

Modified: trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php
===
--- trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php 2010-01-30 
15:31:08 UTC (rev 61718)
+++ trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php 2010-01-30 
15:55:06 UTC (rev 61719)
@@ -26,7 +26,7 @@
'top-fans-by-category-title-edit-count' => 'Top overall edits',
'top-fans-by-category-title-friends-count' => 'Top overall friends',
'top-fans-by-category-title-foe-count' => 'Top overall foes',
-   'top-fans-by-category-title-gifts-rec-count' => 'Top overall gifs 
received',
+   'top-fans-by-category-title-gifts-rec-count' => 'Top overall gifts 
received',
'top-fans-by-category-title-gifts-sent-count' => 'Top overall gifts 
sent',
'top-fans-by-category-title-vote-count' => 'Top overall votes',
'top-fans-by-category-title-comment-count' => 'Top overall comments',



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

[MediaWiki-CVS] SVN: [61718] trunk/extensions/CentralAuth/migratePass0.php

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61718

Revision: 61718
Author:   ialex
Date: 2010-01-30 15:31:08 + (Sat, 30 Jan 2010)

Log Message:
---
Fixed a E_NOTICE about undefined variable

Modified Paths:
--
trunk/extensions/CentralAuth/migratePass0.php

Modified: trunk/extensions/CentralAuth/migratePass0.php
===
--- trunk/extensions/CentralAuth/migratePass0.php   2010-01-30 15:30:39 UTC 
(rev 61717)
+++ trunk/extensions/CentralAuth/migratePass0.php   2010-01-30 15:31:08 UTC 
(rev 61718)
@@ -17,6 +17,7 @@
 
$start = microtime( true );
$migrated = 0;
+   $users = array();
 
// List all user accounts on this wiki in the migration table
// on the central authentication server.



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

[MediaWiki-CVS] SVN: [61717] trunk/extensions/CentralAuth

[catrope]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61717

Revision: 61717
Author:   catrope
Date: 2010-01-30 15:30:39 + (Sat, 30 Jan 2010)

Log Message:
---
CentralAuth: (bug 22312) Add a meta=globaluserinfo module that provides the 
same information as Special:CentralAuth, plus a bit more

Modified Paths:
--
trunk/extensions/CentralAuth/CentralAuth.php

Added Paths:
---
trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php

Added: trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php
===
--- trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php 
(rev 0)
+++ trunk/extensions/CentralAuth/ApiQueryGlobalUserInfo.php 2010-01-30 
15:30:39 UTC (rev 61717)
@@ -0,0 +1,153 @@
+http://www.gnu.org/copyleft/gpl.html
+ */
+
+/**
+ * Query module to list global user info and attachments
+ *
+ * @ingroup API
+ * @ingroup Extensions
+ */
+class ApiQueryGlobalUserInfo extends ApiQueryBase {
+
+   public function __construct( $query, $moduleName ) {
+   parent::__construct( $query, $moduleName, 'gui' );
+   }
+
+   public function execute() {
+   global $wgUser;
+   $params = $this->extractRequestParams();
+   $prop = array_flip( (array)$params['prop'] );
+   if ( is_null( $params['user'] ) ) {
+   $params['user'] = $wgUser->getName();
+   }
+   $user = new CentralAuthUser( $params['user'] );
+   if ( !$user->exists() ) {
+   $this->dieUsageMsg( array( 'nosuchuser', 
$params['user'] ) );
+   }
+   
+   // Add basic info
+   $result = $this->getResult();
+   $data = array(
+   'id' => $user->getId(),
+   'registration' => wfTimestamp( TS_ISO_8601, 
$user->getRegistration() )
+   );
+   if ( $user->isLocked() ) {
+   $data['locked'] = '';
+   }
+   if ( $user->isHidden() ) {
+   $data['hidden'] = '';
+   }
+   $result->addValue( 'query', $this->getModuleName(), $data );
+   
+   // Add requested info
+   if ( isset( $prop['groups'] ) ) {
+   $groups = $user->getGlobalGroups();
+   $result->setIndexedTagName( $groups, 'g' );
+   $result->addValue( array( 'query', 
$this->getModuleName() ), 'groups', $groups );
+   }
+   if ( isset( $prop['rights'] ) ) {
+   $rights = $user->getGlobalRights();
+   $result->setIndexedTagName( $rights, 'r' );
+   $result->addValue( array( 'query', 
$this->getModuleName() ), 'rights', $rights );
+   }
+   if ( isset( $prop['merged'] ) ) {
+   $accounts = $user->queryAttached();
+   foreach ( $accounts as $account ) {
+   $a = array(
+   'wiki' => $account['wiki'],
+   'timestamp' => wfTimestamp( 
TS_ISO_8601, $account['attachedTimestamp'] ),
+   'method' => $account['attachedMethod'],
+   'editcount' => $account['editCount']
+   );
+   if ( $account['blocked'] ) {
+   $a['blocked'] = array(
+   'expiry' => 
Block::decodeExpiry( $account['block-expiry'], TS_ISO_8601 ),
+   'reason' => 
$account['block-reason']
+   );
+   }
+   $result->addValue( array( 'query', 
$this->getModuleName(), 'merged' ), null, $a );
+   }
+   $result->setIndexedTagName_internal( array( 'query', 
$this->getModuleName(), 'merged' ), 'account' );
+   }
+   if ( isset ($prop['unattached'] ) ) {
+   $accounts = $user->queryUnattached();
+   foreach ( $accounts as $account ) {
+   $a = array(
+   'wiki' => $account['wiki'],
+   'editcount' => $account['editCount']
+   );
+   if ( $account['blocked'] ) {
+   $a['blocked'] = array(
+   'expiry' => 
Block::decodeExpiry( $account['block-expiry'], TS_ISO_8601 ),
+   'reason' => 
$account['block-reason']
+ 

[MediaWiki-CVS] SVN: [61716] trunk/tools/planet/en/config.ini

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61716

Revision: 61716
Author:   ialex
Date: 2010-01-30 14:47:31 + (Sat, 30 Jan 2010)

Log Message:
---
Added http://www.generalist.org.uk/blog/tags/wikipedia/ per request on meta

Modified Paths:
--
trunk/tools/planet/en/config.ini

Modified: trunk/tools/planet/en/config.ini
===
--- trunk/tools/planet/en/config.ini2010-01-30 14:27:28 UTC (rev 61715)
+++ trunk/tools/planet/en/config.ini2010-01-30 14:47:31 UTC (rev 61716)
@@ -399,3 +399,6 @@
 
 [http://thomas-dalton.com/blog/tag/wikimedia/feed]
 name=Thomas Dalton (Tango)
+
+[http://www.generalist.org.uk/blog/tags/wikipedia/feed/]
+name=Andrew Gray



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

[MediaWiki-CVS] SVN: [61715] trunk/phase3/includes/User.php

[vasilievvv]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61715

Revision: 61715
Author:   vasilievvv
Date: 2010-01-30 14:27:28 + (Sat, 30 Jan 2010)

Log Message:
---
Fix "you are blocked" message for users who were blocked by zero-ID user.

Modified Paths:
--
trunk/phase3/includes/User.php

Modified: trunk/phase3/includes/User.php
===
--- trunk/phase3/includes/User.php  2010-01-30 12:55:23 UTC (rev 61714)
+++ trunk/phase3/includes/User.php  2010-01-30 14:27:28 UTC (rev 61715)
@@ -1154,6 +1154,8 @@
if ( $this->mBlock->load( $ip , $this->mId ) ) {
wfDebug( __METHOD__ . ": Found block.\n" );
$this->mBlockedby = $this->mBlock->mBy;
+   if( $this->mBlockedby == "0" )
+   $this->mBlockedby = $this->mBlock->mByName;
$this->mBlockreason = $this->mBlock->mReason;
$this->mHideName = $this->mBlock->mHideName;
$this->mAllowUsertalk = $this->mBlock->mAllowUsertalk;



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

[MediaWiki-CVS] SVN: [61714] trunk/extensions/timeline/EasyTimeline.pl

[siebrand]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61714

Revision: 61714
Author:   siebrand
Date: 2010-01-30 12:55:23 + (Sat, 30 Jan 2010)

Log Message:
---
Follow-up r61705: 2009->2010

Modified Paths:
--
trunk/extensions/timeline/EasyTimeline.pl

Modified: trunk/extensions/timeline/EasyTimeline.pl
===
--- trunk/extensions/timeline/EasyTimeline.pl   2010-01-30 12:46:16 UTC (rev 
61713)
+++ trunk/extensions/timeline/EasyTimeline.pl   2010-01-30 12:55:23 UTC (rev 
61714)
@@ -66,7 +66,7 @@
 # - Don't send -mapfile to ploticus without also sending -csmap, this creates 
an XSS 
 #   vulnerability
 #
-# 1.13 Jan 2009
+# 1.13 Jan 2010
 # -change svg encoding from iso-8859-1 -> UTF-8
 
   $version = "1.13" ;



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

[MediaWiki-CVS] SVN: [61713] trunk/phase3

[conrad]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61713

Revision: 61713
Author:   conrad
Date: 2010-01-30 12:46:16 + (Sat, 30 Jan 2010)

Log Message:
---
Fix for r61710. Changing subst: to subst:$1 would cause huge problems with 
localisation
instead add some proper functions to MagicWord.php to deal with the situation.

Modified Paths:
--
trunk/phase3/includes/MagicWord.php
trunk/phase3/includes/parser/Parser.php
trunk/phase3/languages/messages/MessagesEn.php

Modified: trunk/phase3/includes/MagicWord.php
===
--- trunk/phase3/includes/MagicWord.php 2010-01-30 12:09:28 UTC (rev 61712)
+++ trunk/phase3/includes/MagicWord.php 2010-01-30 12:46:16 UTC (rev 61713)
@@ -594,6 +594,21 @@
}
 
/**
+* Get a regex for matching a prefix. Does not match parameters.
+*/
+   function getRegexStart() {
+   $base = $this->getBaseRegex();
+   $newRegex = array( '', '' );
+   if ( $base[0] !== '' ) {
+   $newRegex[0] = str_replace( "\\$1", "", 
"/^(?:{$base[0]})/iuS" );
+   }
+   if ( $base[1] !== '' ) {
+   $newRegex[1] = str_replace( "\\$1", "", 
"/^(?:{$base[1]})/S" );
+   }
+   return $newRegex;
+   }
+
+   /**
 * Get an anchored regex for matching variables
 */
function getVariableStartToEndRegex() {
@@ -691,4 +706,24 @@
}
return $found;
}
+
+   /**
+* Returns the magic word id removed from the start, or false
+* does not match parameters.
+*/
+   public function matchStartAndRemove( &$text ) {
+   $found = FALSE;
+   $regexes = $this->getRegexStart();
+   foreach ( $regexes as $regex ) {
+   if ( $regex === '' ) {
+   continue;
+   }
+   preg_match_all( $regex, $text, $matches, PREG_SET_ORDER 
);
+   foreach ( $matches as $m ) {
+   list( $found, $param ) = $this->parseMatch( $m 
);
+   }
+   $text = preg_replace( $regex, '', $text );
+   }
+   return $found;
+   }
 }

Modified: trunk/phase3/includes/parser/Parser.php
===
--- trunk/phase3/includes/parser/Parser.php 2010-01-30 12:09:28 UTC (rev 
61712)
+++ trunk/phase3/includes/parser/Parser.php 2010-01-30 12:46:16 UTC (rev 
61713)
@@ -2799,18 +2799,14 @@
wfProfileIn( __METHOD__.'-modifiers' );
if ( !$found ) {
 
-   $substMatch = $this->mSubsts->matchVariableStartToEnd( 
$part1 );
+   $substMatch = $this->mSubsts->matchStartAndRemove( 
$part1 );
 
-   # Possibilities for substMatch[0]: "subst", "safesubst" 
or FALSE
+   # Possibilities for substMatch: "subst", "safesubst" or 
FALSE
# Whether to include depends also on whether we are in 
the pre-save-transform
#
-   # safesubst || (subst && PST) => transclude (handled by 
if)
-   # (false && PST) || (subst && !PST)  => return input 
(handled by else if)
-   # false && !PST => transclude (no handling needed here)
-   if ( $substMatch[0] && ( $this->ot['wiki'] || 
$substMatch[0] == 'safesubst' ) ) {
-   $part1 = $substMatch[1];
-
-   } else if ( $substMatch[0] xor $this->ot['wiki'] ) {
+   # safesubst || (subst && PST) || (false && !PST) => 
transclude (skip the if)
+   # (false && PST) || (subst && !PST)  => return input 
(handled by if)
+   if ( $substMatch != 'safesubst' && ($substMatch == 
'subst' xor $this->ot['wiki']) ) {
$text = $frame->virtualBracketedImplode( '{{', 
'|', '}}', $titleWithSpaces, $args );
$isLocalObj = true;
$found = true;

Modified: trunk/phase3/languages/messages/MessagesEn.php
===
--- trunk/phase3/languages/messages/MessagesEn.php  2010-01-30 12:09:28 UTC 
(rev 61712)
+++ trunk/phase3/languages/messages/MessagesEn.php  2010-01-30 12:46:16 UTC 
(rev 61713)
@@ -264,8 +264,8 @@
'subjectpagename'=> array( 1,'SUBJECTPAGENAME', 
'ARTICLEPAGENAME' ),
'subjectpagenamee'   => array( 1,'SUBJECTPAGENAMEE', 
'ARTICLEPAGENAMEE' ),
'msg'=> array( 0,'MSG:'   ),
-   'subst'  => array( 0,'SUBST:$1'   ),
-   'safesu

[MediaWiki-CVS] SVN: [61712] trunk/phase3/includes/api/ApiQueryUserContributions.php

[catrope]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61712

Revision: 61712
Author:   catrope
Date: 2010-01-30 12:09:28 + (Sat, 30 Jan 2010)

Log Message:
---
API: Fix E_NOTICE. !is_null() and isset() are not equivalent when indexing 
arrays

Modified Paths:
--
trunk/phase3/includes/api/ApiQueryUserContributions.php

Modified: trunk/phase3/includes/api/ApiQueryUserContributions.php
===
--- trunk/phase3/includes/api/ApiQueryUserContributions.php 2010-01-30 
12:07:40 UTC (rev 61711)
+++ trunk/phase3/includes/api/ApiQueryUserContributions.php 2010-01-30 
12:09:28 UTC (rev 61712)
@@ -255,7 +255,7 @@
$this->addFields( 'ts_tags' );
}

-   if ( !is_null( $this->params['tag'] ) ) {
+   if ( isset( $this->params['tag'] ) ) {
$this->addTables( 'change_tag' );
$this->addJoinConds( array( 'change_tag' => array( 
'INNER JOIN', array( 'rev_id=ct_rev_id' ) ) ) );
$this->addWhereFld( 'ct_tag', $this->params['tag'] );



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

[MediaWiki-CVS] SVN: [61711] trunk/phase3/includes/DefaultSettings.php

[catrope]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61711

Revision: 61711
Author:   catrope
Date: 2010-01-30 12:07:40 + (Sat, 30 Jan 2010)

Log Message:
---
Bump $wgStyleVersion for r61700

Modified Paths:
--
trunk/phase3/includes/DefaultSettings.php

Modified: trunk/phase3/includes/DefaultSettings.php
===
--- trunk/phase3/includes/DefaultSettings.php   2010-01-30 11:58:19 UTC (rev 
61710)
+++ trunk/phase3/includes/DefaultSettings.php   2010-01-30 12:07:40 UTC (rev 
61711)
@@ -1686,7 +1686,7 @@
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '264';
+$wgStyleVersion = '265';
 
 
 # Server-side caching:



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

[MediaWiki-CVS] SVN: [61710] trunk/phase3

[conrad]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61710

Revision: 61710
Author:   conrad
Date: 2010-01-30 11:58:19 + (Sat, 30 Jan 2010)

Log Message:
---
bug 22297 - "syntax for substitution that doesn't break transclusion"
Adds "safesubst:$1" that works similarly to "subst:$1"
(relevant to bug 5453, bug 16714, bug 4484)

Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/MagicWord.php
trunk/phase3/includes/parser/Parser.php
trunk/phase3/languages/messages/MessagesEn.php

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-01-30 09:10:03 UTC (rev 61709)
+++ trunk/phase3/RELEASE-NOTES  2010-01-30 11:58:19 UTC (rev 61710)
@@ -809,6 +809,7 @@
 * (bug 22248) Output extension URLs in meta=siteinfo&siprop=extensions
 * Support key-params arrays in 'descriptionmsg' in 
meta=siteinfo&siprop=extensions
 * (bug 21922) YAML output should quote asterisk when used as key
+* (bug 22297) safesubst: to allow substitution without breaking transclusion
 
 === Languages updated in 1.16 ===
 

Modified: trunk/phase3/includes/MagicWord.php
===
--- trunk/phase3/includes/MagicWord.php 2010-01-30 09:10:03 UTC (rev 61709)
+++ trunk/phase3/includes/MagicWord.php 2010-01-30 11:58:19 UTC (rev 61710)
@@ -165,6 +165,10 @@
'nocontentconvert',
);
 
+   static public $mSubstIDs = array(
+   'subst',
+   'safesubst',
+   );
 
static public $mObjects = array();
static public $mDoubleUnderscoreArray = null;
@@ -216,6 +220,13 @@
return self::$mVariableIDs;
}
 
+   /**
+* Get an array of parser substitution modifier IDs
+*/
+   static function getSubstIDs() {
+   return self::$mSubstIDs; 
+   }
+
/* Allow external reads of TTL array */
static function getCacheTTL($id) {
if (array_key_exists($id,self::$mCacheTTLs)) {

Modified: trunk/phase3/includes/parser/Parser.php
===
--- trunk/phase3/includes/parser/Parser.php 2010-01-30 09:10:03 UTC (rev 
61709)
+++ trunk/phase3/includes/parser/Parser.php 2010-01-30 11:58:19 UTC (rev 
61710)
@@ -91,9 +91,9 @@
 */
# Persistent:
var $mTagHooks, $mTransparentTagHooks, $mFunctionHooks, 
$mFunctionSynonyms, $mVariables,
-   $mImageParams, $mImageParamsMagicArray, $mStripList, 
$mMarkerIndex, $mPreprocessor,
-   $mExtLinkBracketedRegex, $mUrlProtocols, $mDefaultStripList, 
$mVarCache, $mConf,
-   $mFunctionTagHooks;
+   $mSubsts, $mImageParams, $mImageParamsMagicArray, $mStripList, 
$mMarkerIndex,
+   $mPreprocessor, $mExtLinkBracketedRegex, $mUrlProtocols, 
$mDefaultStripList,
+   $mVarCache, $mConf, $mFunctionTagHooks;
 
 
# Cleared with clearState():
@@ -2617,15 +2617,17 @@
}
 
/**
-* initialise the magic variables (like CURRENTMONTHNAME)
+* initialise the magic variables (like CURRENTMONTHNAME) and 
substitution modifiers 
 *
 * @private
 */
function initialiseVariables() {
wfProfileIn( __METHOD__ );
$variableIDs = MagicWord::getVariableIDs();
+   $substIDs = MagicWord::getSubstIDs();
 
$this->mVariables = new MagicWordArray( $variableIDs );
+   $this->mSubsts = new MagicWordArray( $substIDs );
wfProfileOut( __METHOD__ );
}
 
@@ -2796,12 +2798,19 @@
# SUBST
wfProfileIn( __METHOD__.'-modifiers' );
if ( !$found ) {
-   $mwSubst = MagicWord::get( 'subst' );
-   if ( $mwSubst->matchStartAndRemove( $part1 ) xor 
$this->ot['wiki'] ) {
-   # One of two possibilities is true:
-   # 1) Found SUBST but not in the PST phase
-   # 2) Didn't find SUBST and in the PST phase
-   # In either case, return without further 
processing
+
+   $substMatch = $this->mSubsts->matchVariableStartToEnd( 
$part1 );
+
+   # Possibilities for substMatch[0]: "subst", "safesubst" 
or FALSE
+   # Whether to include depends also on whether we are in 
the pre-save-transform
+   #
+   # safesubst || (subst && PST) => transclude (handled by 
if)
+   # (false && PST) || (subst && !PST)  => return input 
(handled by else if)
+   # false && !PST => transclude (no handling needed here)
+   if ( $substMatch[0] && ( $this->ot['wiki'] || 
$substMatch[0] == 'safesubst' ) ) {
+   

[MediaWiki-CVS] SVN: [61709] trunk/phase3/includes/specials/SpecialContributions.php

[aaron]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61709

Revision: 61709
Author:   aaron
Date: 2010-01-30 09:10:03 + (Sat, 30 Jan 2010)

Log Message:
---
* Show diff link for DELETED_TEXT revs if user can see them (like history)
* Broke long line

Modified Paths:
--
trunk/phase3/includes/specials/SpecialContributions.php

Modified: trunk/phase3/includes/specials/SpecialContributions.php
===
--- trunk/phase3/includes/specials/SpecialContributions.php 2010-01-30 
08:49:23 UTC (rev 61708)
+++ trunk/phase3/includes/specials/SpecialContributions.php 2010-01-30 
09:10:03 UTC (rev 61709)
@@ -562,12 +562,14 @@
if( $row->rev_id == $row->page_latest ) {
$topmarktext .= '' . 
$this->messages['uctop'] . '';
# Add rollback link
-   if( !$row->page_is_new && $page->quickUserCan( 
'rollback' ) && $page->quickUserCan( 'edit' ) ) {
+   if( !$row->page_is_new && $page->quickUserCan( 
'rollback' )
+   && $page->quickUserCan( 'edit' ) )
+   {
$topmarktext .= ' '.$sk->generateRollback( $rev 
);
}
}
# Is there a visible previous revision?
-   if( !$rev->isDeleted( Revision::DELETED_TEXT ) && 
$rev->getParentId() !== 0 ) {
+   if( $rev->userCan( Revision::DELETED_TEXT ) && 
$rev->getParentId() !== 0 ) {
$difftext = $sk->linkKnown(
$page,
$this->messages['diff'],



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

[MediaWiki-CVS] SVN: [61708] trunk/phase3/languages/messages

[shinjiman]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61708

Revision: 61708
Author:   shinjiman
Date: 2010-01-30 08:49:23 + (Sat, 30 Jan 2010)

Log Message:
---
Localisation updates Cantonese, Chinese and Literary Chinese

Modified Paths:
--
trunk/phase3/languages/messages/MessagesLzh.php
trunk/phase3/languages/messages/MessagesYue.php
trunk/phase3/languages/messages/MessagesZh_hans.php
trunk/phase3/languages/messages/MessagesZh_hant.php

Modified: trunk/phase3/languages/messages/MessagesLzh.php
===
--- trunk/phase3/languages/messages/MessagesLzh.php 2010-01-30 08:05:49 UTC 
(rev 61707)
+++ trunk/phase3/languages/messages/MessagesLzh.php 2010-01-30 08:49:23 UTC 
(rev 61708)
@@ -486,6 +486,7 @@
 'nosuchuser' => '查無此人。',
 'nosuchusershort'=> '查無"$1"，惠核之。',
 'nouserspecified'=> '簿名須也',
+'login-userblocked'  => '此簿已被封。登無簿也。',
 'wrongpassword'  => '符節不合，惠核之。',
 'wrongpasswordempty' => '缺符節，惠補之。',
 'passwordtooshort'   => '符節莫逾$1字。',
@@ -1336,7 +1337,7 @@
 # HTTP errors
 'http-invalid-url'=> '無效之網址：$1',
 'http-invalid-scheme' => '有「$1」之網址無持也',
-'http-request-error'  => '呈求時錯之：',
+'http-request-error'  => '未知之錯令HTTP求時錯之。',
 
 'license'   => '權：',
 'license-header'=> '權',

Modified: trunk/phase3/languages/messages/MessagesYue.php
===
--- trunk/phase3/languages/messages/MessagesYue.php 2010-01-30 08:05:49 UTC 
(rev 61707)
+++ trunk/phase3/languages/messages/MessagesYue.php 2010-01-30 08:49:23 UTC 
(rev 61708)
@@ -580,6 +580,7 @@
 請檢查你個名嘅輸入方法，或者[[Special:UserLogin/signup|建立一個新嘅戶口]]。',
 'nosuchusershort'=> '呢度冇叫做 "$1"嘅用戶。 請檢查你個名嘅輸入方法。',
 'nouserspecified'=> '你需要指定一個用戶名。',
+'login-userblocked'  => '呢位用戶封鎖咗。唔容許登入。',
 'wrongpassword'  => '密碼唔啱，麻煩你再試多次。',
 'wrongpasswordempty' => '你都未入密碼，唔該再試多次啦。',
 'passwordtooshort'   => '你嘅密碼最少要有$1個半形字元。',
@@ -1525,7 +1526,7 @@
 # HTTP errors
 'http-invalid-url'=> '無效嘅URL：$1',
 'http-invalid-scheme' => '有 "$1" 嘅URL唔支援',
-'http-request-error'  => '傳送請求嗰陣出錯：',
+'http-request-error'  => '有個未知嘅錯誤令HTTP請求失敗。',
 
 # Some likely curl errors. More could be added from 

 'upload-curl-error6'   => '唔可以到嗰個URL',

Modified: trunk/phase3/languages/messages/MessagesZh_hans.php
===
--- trunk/phase3/languages/messages/MessagesZh_hans.php 2010-01-30 08:05:49 UTC 
(rev 61707)
+++ trunk/phase3/languages/messages/MessagesZh_hans.php 2010-01-30 08:49:23 UTC 
(rev 61708)
@@ -628,6 +628,7 @@
 'nosuchuser' => 
'找不到用户“$1”。用户名是大小写敏感且区分繁简体的。请检查您的拼写，或者[[Special:UserLogin/signup|建立一个新账户]]。',
 'nosuchusershort'=> 
'没有一个名为“$1”的用户。请检查您输入的文字是否有错误。',
 'nouserspecified'=> '你需要指定一个用户名。',
+'login-userblocked'  => '这位用户已被封锁。不容许登录。',
 'wrongpassword'  => '您输入的密码错误，请再试一次。',
 'wrongpasswordempty' => '您没有输入密码，请重试！',
 'passwordtooshort'   => '您的密码至少需要$1个字符。',
@@ -1561,7 +1562,7 @@
 # HTTP errors
 'http-invalid-url'=> '无效URL：$1',
 'http-invalid-scheme' => '不支持带有“$1”的URL',
-'http-request-error'  => '发送请求时发生错误：',
+'http-request-error'  => '未知的错误令到HTTP请求失败。',
 
 # Some likely curl errors. More could be added from 

 'upload-curl-error6'   => '无法访问URL',

Modified: trunk/phase3/languages/messages/MessagesZh_hant.php
===
--- trunk/phase3/languages/messages/MessagesZh_hant.php 2010-01-30 08:05:49 UTC 
(rev 61707)
+++ trunk/phase3/languages/messages/MessagesZh_hant.php 2010-01-30 08:49:23 UTC 
(rev 61708)
@@ -623,6 +623,7 @@
 檢查您的拼寫，或者用下面的表格[[Special:UserLogin/signup|建立一個新賬號]]。',
 'nosuchusershort'=> 
'沒有一個名為「$1」的用戶。請檢查您輸入的文字是否有錯誤。',
 'nouserspecified'=> '{{GENDER:|你|妳|你}}需要指定一個用戶名。',
+'login-userblocked'  => '這位用戶已被封鎖。不容許登入。',
 'wrongpassword'  => '您輸入的密碼錯誤，請再試一次。',
 'wrongpasswordempty' => '沒有輸入密碼！請重試。',
 'passwordtooshort'   => '您的密碼不能少於$1個字元。',
@@ -1568,7 +1569,7 @@
 # HTTP errors
 'http-invalid-url'=> '無效的URL：$1',
 'http-invalid-scheme' => '不支援含有「$1」的URL',
-'http-request-error'  => '發送請求時發生錯誤：',
+'http-request-error'  => '未知的錯誤令到HTTP請求失敗。',
 
 # Some likely curl errors. More could be added from 

 'upload-curl-error6'   => '無法訪問 URL',



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

[MediaWiki-CVS] SVN: [61707] trunk/extensions/FlaggedRevs

[aaron]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61707

Revision: 61707
Author:   aaron
Date: 2010-01-30 08:05:49 + (Sat, 30 Jan 2010)

Log Message:
---
* Removed redundant isArticleRelated() check
* Removed redundant limitedUI() function
* Removed reviewform=1 param, mostly redundant and mostly set useless keys. 
Replaced with reviewing=1 param where actually needed.
* Fixed unreviewed pages spacing
* Various smaller cleanups

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedArticle.php
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
trunk/extensions/FlaggedRevs/specialpages/OldReviewedPages_body.php
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
trunk/extensions/FlaggedRevs/specialpages/UnreviewedPages_body.php

Modified: trunk/extensions/FlaggedRevs/FlaggedArticle.php
===
--- trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-01-30 07:24:50 UTC 
(rev 61706)
+++ trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-01-30 08:05:49 UTC 
(rev 61707)
@@ -40,14 +40,6 @@
$config = $this->getVisibilitySettings();
return (bool)$config['override'];
}
-   
-/**
-* Is most of the UI on this page to be hidden?
-* @returns bool
-*/
-   public function limitedUI() {
-   return ( FlaggedRevs::forDefaultVersionOnly() && 
!$this->isStableShownByDefault() );
-   }
 
/**
 * Is this page less open than the site defaults?

Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-01-30 07:24:50 UTC 
(rev 61706)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-01-30 08:05:49 UTC 
(rev 61707)
@@ -121,8 +121,8 @@
public function displayTag() {
global $wgOut, $wgRequest;
$this->load();
-   // UI may be limited to unobtrusive patrolling system
-   if ( $wgRequest->getVal( 'stableid' ) || 
!$this->article->limitedUI() ) {
+   // Sanity check that this is in reviewable namespace
+   if ( $this->article->isReviewable( true ) ) {
$wgOut->appendSubtitle( $this->reviewNotice );
}
return true;
@@ -136,9 +136,9 @@
public function addStableLink() {
global $wgRequest, $wgOut, $wgLang;
$this->load();
-   # Only for viewing old versions. UI may be limited to 
unobtrusive patrolling system.
-   if ( !$wgRequest->getVal( 'oldid' ) || 
$this->article->limitedUI() )
+   if ( !$this->article->isReviewable() || !$wgRequest->getVal( 
'oldid' ) ) {
return true;
+   }
# We may have nav links like "direction=prev&oldid=x"
$revID = $this->article->getOldIDFromRequest();
$frev = FlaggedRevision::newFromTitle( 
$this->article->getTitle(), $revID );
@@ -721,7 +721,7 @@
global $wgOut;
$this->load();
# Must be reviewable. UI may be limited to unobtrusive 
patrolling system.
-   if ( !$this->article->isReviewable() || 
$this->article->limitedUI() ) {
+   if ( !$this->article->isReviewable() ) {
return true;
}
# Add a notice if there are pending edits...
@@ -743,7 +743,7 @@
global $wgRequest, $wgOut, $wgLang, $wgUser;
$this->load();
# Must be reviewable. UI may be limited to unobtrusive 
patrolling system.
-   if ( !$this->article->isReviewable() || 
$this->article->limitedUI() ) {
+   if ( !$this->article->isReviewable() ) {
return true;
}
$items = array();
@@ -912,10 +912,6 @@
{
return true;
}
-   # Unobtrusive patrolling UI only shows forms if requested
-   if ( !$wgRequest->getInt( 'reviewform' ) && 
$this->article->limitedUI() ) {
-   return true;
-   }
# Avoid multi-page diffs that are useless and misbehave (bug 
19327)
if ( $this->isMultiPageDiff ) {
return true;
@@ -1014,7 +1010,7 @@
$fa = FlaggedArticle::getTitleInstance( $title );
 
$action = $wgRequest->getVal( 'action', 'view' );
-   if ( !$fa->isReviewable() || $fa->limitedUI() ) {
+   if ( !$fa->isReviewable() ) {
return true; // Not a reviewable page or the UI is 
hidden
}
$flags = ( $action == 'rollback' ) ? FR_M