date:20100618

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

2010-06-18 Thread aaron

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

Revision: 68261
Author:   aaron
Date: 2010-06-19 04:37:00 + (Sat, 19 Jun 2010)

Log Message:
---
Refactored out and improved code from maybeMakeEditor() into new 
updateUserParams() function

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php

Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.class.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevs.class.php  2010-06-19 03:11:55 UTC 
(rev 68260)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.class.php  2010-06-19 04:37:00 UTC 
(rev 68261)
@@ -1482,6 +1482,48 @@
return ( $dbw->affectedRows() > 0 );
}
 
+   /**
+   * Update users params array for a user on edit
+   * @param &array $params
+   * @param Article $article the article just edited
+   * @param string $summary edit summary
+   * @returns bool anything changed
+   */
+   public static function updateUserParams( array &$p, Article $article, 
$summary ) {
+   global $wgFlaggedRevsAutoconfirm, $wgFlaggedRevsAutopromote;
+   # Update any special counters for non-null revisions
+   $changed = false;
+   if ( $article->getTitle()->isContentPage() ) {
+   $pages = explode( ',', trim( $p['uniqueContentPages'] ) 
); // page IDs
+   # Don't let this get bloated for no reason
+   $maxUniquePages = 50; // some flexibility
+   if ( is_array( $wgFlaggedRevsAutoconfirm ) &&
+   $wgFlaggedRevsAutoconfirm['uniqueContentPages'] 
> $maxUniquePages )
+   {
+   $maxUniquePages = 
$wgFlaggedRevsAutoconfirm['uniqueContentPages'];
+   }
+   if ( is_array( $wgFlaggedRevsAutopromote ) &&
+   $wgFlaggedRevsAutopromote['uniqueContentPages'] 
> $maxUniquePages )
+   {
+   $maxUniquePages = 
$wgFlaggedRevsAutopromote['uniqueContentPages'];
+   }
+   if ( count( $pages ) < $maxUniquePages // limit the 
size of this
+   && !in_array( $article->getId(), $pages ) )
+   {
+   $pages[] = $article->getId();
+   // Clear out any formatting garbage
+   $p['uniqueContentPages'] = preg_replace( 
'/^,/', '', implode( ',', $pages ) );
+   }
+   $p['totalContentEdits'] += 1;
+   $changed = true;
+   }
+   if ( $summary != '' ) {
+   $p['editComments'] += 1;
+   $changed = true;
+   }
+   return $changed;
+   }
+
#  Auto-review function #
 
/**

Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php  2010-06-19 03:11:55 UTC 
(rev 68260)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php  2010-06-19 04:37:00 UTC 
(rev 68261)
@@ -1283,35 +1283,18 @@
if ( !$rev || !$user->getId() ) {
return true;
# No sense in running counters if nothing uses them
-   } elseif ( empty( $wgFlaggedRevsAutopromote ) && empty( 
$wgFlaggedRevsAutoconfirm ) ) {
+   } elseif ( !$wgFlaggedRevsAutopromote && 
!$wgFlaggedRevsAutoconfirm ) {
return true;
}
$p = FlaggedRevs::getUserParams( $user->getId() );
-   # Update any special counters for non-null revisions
-   $changed = false;
-   $pages = array();
-   if ( $article->getTitle()->isContentPage() ) {
-   $pages = explode( ',', trim( $p['uniqueContentPages'] ) 
); // page IDs
-   # Don't let this get bloated for no reason
-   # (assumes $wgFlaggedRevsAutopromote is stricter than 
$wgFlaggedRevsAutoconfirm)
-   if ( count( $pages ) < 
$wgFlaggedRevsAutopromote['uniqueContentPages']
-   && !in_array( $article->getId(), $pages ) )
-   {
-   $pages[] = $article->getId();
-   // Clear out any formatting garbage
-   $p['uniqueContentPages'] = preg_replace( 
'/^,/', '', implode( ',', $pages ) );
-   }
-   $p['totalContentEdits'] += 1;
-   $changed = true;
-   }
-

[MediaWiki-CVS] SVN: [68260] trunk/extensions/SocialProfile/UserBoard

2010-06-18 Thread ashley

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

Revision: 68260
Author:   ashley
Date: 2010-06-19 03:11:55 + (Sat, 19 Jun 2010)

Log Message:
---
SocialProfile: cleanup to UserBoard

Modified Paths:
--
trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php

Modified: trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
===
--- trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php   
2010-06-18 23:31:39 UTC (rev 68259)
+++ trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php   
2010-06-19 03:11:55 UTC (rev 68260)
@@ -251,7 +251,7 @@
' . wfMsg( 
'userboard_private' ) . '


-   
+   
 


@@ -260,9 +260,9 @@
';
} else {
$login_link = SpecialPage::getTitleFor( 
'Userlogin' );
-   $output .= '
-   ' . wfMsg( 
'userboard_loggedout', $login_link->escapeFullURL() ) . '
-   ';
+   $output .= ''
+   . wfMsg( 'userboard_loggedout', 
$login_link->escapeFullURL() ) .
+   '';
}
}
$output .= '';
@@ -284,14 +284,12 @@
}
if ( $wgUser->getName() == 
$ub_message['user_name'] || $wgUser->isAllowed( 'userboard-delete' ) ) {
$delete_link = "
-   " . wfMsg( 
'userboard_delete' ) . "
-   ";
+   " . wfMsg( 
'userboard_delete' ) . '
+   ';
}
if ( $ub_message['type'] == 1 ) {
$ub_message_type_label = '(' . wfMsg( 
'userboard_private' ) . ')';
}
-   // global $max_link_text_length;
-   // $max_link_text_length = 75;
 
// had global function to cut link text if too 
long and no breaks
// $ub_message_text = preg_replace_callback( 
"/(]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
@@ -299,16 +297,16 @@
 
$output .= "

-   escapeFullURL()}\" 
title=\"{$ub_message["user_name_from"]}}\">{$ub_message["user_name_from"]}  
{$ub_message_type_label}
+   escapeFullURL()}\" 
title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']}  
{$ub_message_type_label}

-   
-   " . wfMsgHtml( 
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) ) . "
-   
+   "
+   . wfMsgHtml( 
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) ) .
+   "


-   escapeFullURL()}\" 
title=\"{$ub_message["user_name_from"]}\">{$avatar->getAvatarURL()}
+   escapeFullURL()}\" 
title=\"{$ub_message['user_name_from']}\">{$avatar->getAvatarURL()}

-   
+   
{$ub_message_text}



Modified: trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
===
--- trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2010-06-18 
23:31:39 UTC (rev 68259)
+++ trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2010-06-19 
03:11:55 UTC (rev 68260)
@@ -47,7 +47,7 @@
__METHOD__
);
 
-   // Send Email (if user is not writing on own board)
+

[MediaWiki-CVS] SVN: [68258] trunk/phase3/maintenance/language/messages.inc

2010-06-18 Thread raymond

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

Revision: 68258
Author:   raymond
Date: 2010-06-18 23:19:18 + (Fri, 18 Jun 2010)

Log Message:
---
Follow-up r68224: Update maintenance script

Modified Paths:
--
trunk/phase3/maintenance/language/messages.inc

Modified: trunk/phase3/maintenance/language/messages.inc
===
--- trunk/phase3/maintenance/language/messages.inc  2010-06-18 23:14:19 UTC 
(rev 68257)
+++ trunk/phase3/maintenance/language/messages.inc  2010-06-18 23:19:18 UTC 
(rev 68258)
@@ -191,6 +191,7 @@
'vector-namespace-talk',
'vector-namespace-template',
'vector-namespace-user',
+   'vector-simplesearch-preference',
'vector-view-create',
'vector-view-edit',
'vector-view-history',



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

[MediaWiki-CVS] SVN: [68257] trunk/extensions/NewUserNotif

2010-06-18 Thread jdpond

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

Revision: 68257
Author:   jdpond
Date: 2010-06-18 23:14:19 + (Fri, 18 Jun 2010)

Log Message:
---
1.5.2 Allows you to add to or modify the parameters passed to both the email 
subject line and the body without modifying the extension code.

Modified Paths:
--
trunk/extensions/NewUserNotif/NewUserNotif.class.php
trunk/extensions/NewUserNotif/NewUserNotif.php
trunk/extensions/NewUserNotif/README

Modified: trunk/extensions/NewUserNotif/NewUserNotif.class.php
===
--- trunk/extensions/NewUserNotif/NewUserNotif.class.php2010-06-18 
23:07:25 UTC (rev 68256)
+++ trunk/extensions/NewUserNotif/NewUserNotif.class.php2010-06-18 
23:14:19 UTC (rev 68257)
@@ -39,13 +39,13 @@
 * Send email to external addresses
 */
private function sendExternalMails() {
-   global $wgNewUserNotifEmailTargets, $wgSitename;
+   global $wgNewUserNotifEmailTargets, $wgNewUserNotifSenderParam, 
$wgNewUserNotifSenderSubjParam;
foreach( $wgNewUserNotifEmailTargets as $target ) {
userMailer(
new MailAddress( $target ),
new MailAddress( $this->sender ),
-   wfMsgForContent( 'newusernotifsubj', 
$wgSitename ),
-   $this->makeMessage( $target, $this->user )
+   $this->makeMessage( $target, $this->user, 
'newusernotifsubj', $wgNewUserNotifSenderSubjParam),
+   $this->makeMessage( $target, $this->user, 
'newusernotifbody', $wgNewUserNotifSenderParam)
);
}
}
@@ -54,13 +54,13 @@
 * Send email to users
 */
private function sendInternalMails() {
-   global $wgNewUserNotifTargets, $wgSitename;
+   global $wgNewUserNotifTargets, $wgNewUserNotifSenderParam, 
$wgNewUserNotifSenderSubjParam;
foreach( $wgNewUserNotifTargets as $userSpec ) {
$user = $this->makeUser( $userSpec );
if( $user instanceof User && $user->isEmailConfirmed() 
) {
$user->sendMail(
-   wfMsgForContent( 'newusernotifsubj', 
$wgSitename ),
-   $this->makeMessage( $user->getName(), 
$this->user ),
+   $this->makeMessage( $user->getName(), 
$this->user, 'newusernotifsubj', $wgNewUserNotifSenderSubjParam ),
+   $this->makeMessage( $user->getName(), 
$this->user, 'newusernotifbody', $wgNewUserNotifSenderParam ),
$this->sender
);
}
@@ -82,22 +82,18 @@
}
 
/**
-* Build a notification email
+* Build a notification email message (body and subject)
 *
-* @param string $recipient Name of the recipient
-* @param User $user User that was created
+* @param string $recipient Name of the new user notification email 
recipient
+* @param User $user User (object) created for new user
+* @param string $msgId Localised Message Identifier
+* @param string $parmArr Array of Strings eval'd to pass parameters to 
message 
+* @return string
 */
-   private function makeMessage( $recipient, $user ) {
-   global $wgSitename, $wgContLang;
-   return wfMsgForContent(
-   'newusernotifbody',
-   $recipient,
-   $user->getName(),
-   $wgSitename,
-   $wgContLang->timeAndDate( wfTimestampNow() ),
-   $wgContLang->date( wfTimestampNow() ),
-   $wgContLang->time( wfTimestampNow() )
-   );
+   private function makeMessage( $recipient, $user, $msgId, $parmArr) {
+   global $wgSitename,$wgContLang;
+   eval( "\$retval = 
wfMsgForContent('".$msgId."',".implode(",",$parmArr).");" );
+   return ($retval);
}
 
/**

Modified: trunk/extensions/NewUserNotif/NewUserNotif.php
===
--- trunk/extensions/NewUserNotif/NewUserNotif.php  2010-06-18 23:07:25 UTC 
(rev 68256)
+++ trunk/extensions/NewUserNotif/NewUserNotif.php  2010-06-18 23:14:19 UTC 
(rev 68257)
@@ -15,7 +15,7 @@
 $wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name'   => 'New User Email Notification',
-   'version'=> '1.5.1',
+   'version'=> '1.5.2',
'author' => 'Rob Church',
'url'=> 
'http://www.mediawiki.org/wiki/E

[MediaWiki-CVS] SVN: [68256] trunk/phase3/maintenance/tests/RunSeleniumTests.php

2010-06-18 Thread pdhanda

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

Revision: 68256
Author:   pdhanda
Date: 2010-06-18 23:07:25 + (Fri, 18 Jun 2010)

Log Message:
---
Test commit. No Changes.

Modified Paths:
--
trunk/phase3/maintenance/tests/RunSeleniumTests.php

Modified: trunk/phase3/maintenance/tests/RunSeleniumTests.php
===
--- trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-06-18 23:03:47 UTC 
(rev 68255)
+++ trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-06-18 23:07:25 UTC 
(rev 68256)
@@ -33,7 +33,7 @@
die( -1 );
 }
 
-// Command line only
+// Command line only 
 if ( $wgSeleniumTestsRunMode == 'cli' && php_sapi_name() != 'cli' ) {
echo "Must be run from the command line.\n";
die( -1 );
@@ -97,3 +97,4 @@
 foreach ( $wgSeleniumTestSuites as $suite ) {
$suite->run( $result );
 }
+



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

[MediaWiki-CVS] SVN: [68255] trunk/phase3/maintenance/tests/RunSeleniumTests.php

2010-06-18 Thread tparscal

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

Revision: 68255
Author:   tparscal
Date: 2010-06-18 23:03:47 + (Fri, 18 Jun 2010)

Log Message:
---
Added new line at end of file (just testing a commit for pdhanda)

Modified Paths:
--
trunk/phase3/maintenance/tests/RunSeleniumTests.php

Modified: trunk/phase3/maintenance/tests/RunSeleniumTests.php
===
--- trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-06-18 22:53:41 UTC 
(rev 68254)
+++ trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-06-18 23:03:47 UTC 
(rev 68255)
@@ -96,4 +96,4 @@
 // run tests
 foreach ( $wgSeleniumTestSuites as $suite ) {
$suite->run( $result );
-}
\ No newline at end of file
+}



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

[MediaWiki-CVS] SVN: [68254] trunk/extensions/UsabilityInitiative/js/thirdparty/ contentCollector.js

2010-06-18 Thread pdhanda

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

Revision: 68254
Author:   pdhanda
Date: 2010-06-18 22:53:41 + (Fri, 18 Jun 2010)

Log Message:
---
Test commit. No Changes.

Modified Paths:
--
trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js

Modified: trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js
===
--- trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js  
2010-06-18 22:23:40 UTC (rev 68253)
+++ trunk/extensions/UsabilityInitiative/js/thirdparty/contentCollector.js  
2010-06-18 22:53:41 UTC (rev 68254)
@@ -421,3 +421,5 @@
 
return cc;
 }
+
+



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

[MediaWiki-CVS] SVN: [68252] trunk/extensions/SemanticForms/includes/SF_FormPrinter.php

2010-06-18 Thread yaron

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

Revision: 68252
Author:   yaron
Date: 2010-06-18 22:19:59 + (Fri, 18 Jun 2010)

Log Message:
---
Undoing change by jeroendedauw - I, for one, think 9000 lines would be too many!

Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_FormPrinter.php

Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
===
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.php  2010-06-18 
22:13:22 UTC (rev 68251)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.php  2010-06-18 
22:19:59 UTC (rev 68252)
@@ -124,9 +124,6 @@
 return false;
   }
 
-  /**
-   * FIXME: This method has only 1231 lines, which is not over 9000! O_o
-   */  
   function formHTML( $form_def, $form_submitted, $source_is_page, $form_id = 
null, $existing_page_content = null, $page_name = null, $page_name_formula = 
null, $is_query = false, $embedded = false ) {
 global $wgRequest, $wgUser, $wgParser;
 global $sfgTabIndex; // used to represent the current tab index in the form



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

[MediaWiki-CVS] SVN: [68250] tags/extensions/SemanticResultFormats/REL_1_5_0/

2010-06-18 Thread fabianh

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

Revision: 68250
Author:   fabianh
Date: 2010-06-18 21:40:25 + (Fri, 18 Jun 2010)

Log Message:
---


Added Paths:
---
tags/extensions/SemanticResultFormats/REL_1_5_0/



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

[MediaWiki-CVS] SVN: [68249] trunk/extensions/JS2Support/tests/testLang.html

2010-06-18 Thread dale

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

Revision: 68249
Author:   dale
Date: 2010-06-18 21:24:50 + (Fri, 18 Jun 2010)

Log Message:
---
fixed loading spinner ref

Modified Paths:
--
trunk/extensions/JS2Support/tests/testLang.html

Modified: trunk/extensions/JS2Support/tests/testLang.html
===
--- trunk/extensions/JS2Support/tests/testLang.html 2010-06-18 21:09:33 UTC 
(rev 68248)
+++ trunk/extensions/JS2Support/tests/testLang.html 2010-06-18 21:24:50 UTC 
(rev 68249)
@@ -210,7 +210,7 @@
o+=' ';   
});
// remove the spiner
-   $j( '.loading_spinner').remove();
+   $j( '.loadingSpinner').remove();
//put the output into the page: 
$j('#table_out').append( o );   

}); 



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

[MediaWiki-CVS] SVN: [68248] trunk/extensions/FlaggedRevs/maintenance/updateStats.inc

2010-06-18 Thread aaron

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

Revision: 68248
Author:   aaron
Date: 2010-06-18 21:09:33 + (Fri, 18 Jun 2010)

Log Message:
---
Ignore $mod if FlaggedRevs::stableOnlyIfConfigured() to avoid sample problems

Modified Paths:
--
trunk/extensions/FlaggedRevs/maintenance/updateStats.inc

Modified: trunk/extensions/FlaggedRevs/maintenance/updateStats.inc
===
--- trunk/extensions/FlaggedRevs/maintenance/updateStats.inc2010-06-18 
21:08:36 UTC (rev 68247)
+++ trunk/extensions/FlaggedRevs/maintenance/updateStats.inc2010-06-18 
21:09:33 UTC (rev 68248)
@@ -143,9 +143,13 @@
$minTS = max($minTS,$installed);
# Get timestamp boundaries
$timeCondition = 'rev_timestamp BETWEEN '.$encMinTS.' AND '.$encMaxTS;
-   # Modulus (to spread out over range)
-   $mod = intval($rows/$size);
-   $mod = max($mod,1); # $mod >= 1
+   if ( FlaggedRevs::stableOnlyIfConfigured() ) {
+   $mod = 1; // can't estimate $mod based on all edits in the range
+   } else {
+   # Modulus (to spread out over range)
+   $mod = intval($rows/$size);
+   $mod = max($mod,1); # $mod >= 1
+   }
# For edits that started off pending, how long do they take to get 
reviewed?
# Get the *first* reviewed rev *after* each RC item and get the average 
difference.
# Only do this for revisions to pages that *were* already logged as 
reviewed.



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

[MediaWiki-CVS] SVN: [68247] trunk/extensions/SemanticResultFormats/SRF_Settings.php

2010-06-18 Thread fabianh

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

Revision: 68247
Author:   fabianh
Date: 2010-06-18 21:08:36 + (Fri, 18 Jun 2010)

Log Message:
---
changed version

Modified Paths:
--
trunk/extensions/SemanticResultFormats/SRF_Settings.php

Modified: trunk/extensions/SemanticResultFormats/SRF_Settings.php
===
--- trunk/extensions/SemanticResultFormats/SRF_Settings.php 2010-06-18 
21:05:34 UTC (rev 68246)
+++ trunk/extensions/SemanticResultFormats/SRF_Settings.php 2010-06-18 
21:08:36 UTC (rev 68247)
@@ -9,7 +9,7 @@
die( 'Not an entry point.' );
 }
 
-define( 'SRF_VERSION', '1.4.6' );
+define( 'SRF_VERSION', '1.5.0' );
 
 $srfgScriptPath = $wgScriptPath . '/extensions/SemanticResultFormats'; // 
TODO: fix hardcoded path
 $srfgIP = dirname( __FILE__ );



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

[MediaWiki-CVS] SVN: [68246] trunk/extensions/SemanticResultFormats/README

2010-06-18 Thread fabianh

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

Revision: 68246
Author:   fabianh
Date: 2010-06-18 21:05:34 + (Fri, 18 Jun 2010)

Log Message:
---


Modified Paths:
--
trunk/extensions/SemanticResultFormats/README

Modified: trunk/extensions/SemanticResultFormats/README
===
--- trunk/extensions/SemanticResultFormats/README   2010-06-18 21:04:49 UTC 
(rev 68245)
+++ trunk/extensions/SemanticResultFormats/README   2010-06-18 21:05:34 UTC 
(rev 68246)
@@ -7,8 +7,8 @@
 of all included formats.
 
 Semantic Result Formats requires Semantic MediaWiki to run, at least at the
-same second-level version number as Semantic Result Formats, i.e. SRF 1.4.1
-requires SMW 1.4.0.
+same second-level version number as Semantic Result Formats, i.e. SRF 1.5.0
+requires SMW 1.5.0.
 
 For more information, see the SRF homepage at:
 http://www.mediawiki.org/wiki/Extension:Semantic_Result_Formats



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

[MediaWiki-CVS] SVN: [68245] trunk/phase3/maintenance/tests

2010-06-18 Thread ialex

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

Revision: 68245
Author:   ialex
Date: 2010-06-18 21:04:49 + (Fri, 18 Jun 2010)

Log Message:
---
Fixed some doxygen warnings

Modified Paths:
--
trunk/phase3/maintenance/tests/MediaWikiParserTest.php
trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php

Modified: trunk/phase3/maintenance/tests/MediaWikiParserTest.php
===
--- trunk/phase3/maintenance/tests/MediaWikiParserTest.php  2010-06-18 
21:04:10 UTC (rev 68244)
+++ trunk/phase3/maintenance/tests/MediaWikiParserTest.php  2010-06-18 
21:04:49 UTC (rev 68245)
@@ -116,6 +116,7 @@
 
private $uploadDir;
private $keepUploads;
+
/**
 * Remove the dummy uploads directory
 */
@@ -158,7 +159,8 @@
 
/**
 * Delete the specified files, if they exist.
-* @param array $files full paths to files to delete.
+*
+* @param $files Array: full paths to files to delete.
 */
private static function deleteFiles( $files ) {
foreach ( $files as $file ) {
@@ -167,9 +169,11 @@
}
}
}
+
/**
 * Delete the specified directories, if they exist. Must be empty.
-* @param array $dirs full paths to directories to delete.
+*
+* @param $dirs Array: full paths to directories to delete.
 */
private static function deleteDirs( $dirs ) {
foreach ( $dirs as $dir ) {
@@ -182,7 +186,8 @@
/**
 * Create a dummy uploads directory which will contain a couple
 * of files in order to pass existence tests.
-* @return string The directory
+*
+* @return String: the directory
 */
private function setupUploadDir() {
global $IP;

Modified: trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php
===
--- trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php   2010-06-18 
21:04:10 UTC (rev 68244)
+++ trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php   2010-06-18 
21:04:49 UTC (rev 68245)
@@ -67,6 +67,7 @@
 
private $uploadDir;
private $keepUploads;
+
/**
 * Remove the dummy uploads directory
 */
@@ -110,7 +111,8 @@
 
/**
 * Delete the specified files, if they exist.
-* @param array $files full paths to files to delete.
+*
+* @param $files Array: full paths to files to delete.
 */
private static function deleteFiles( $files ) {
foreach ( $files as $file ) {
@@ -119,9 +121,11 @@
}
}
}
+
/**
 * Delete the specified directories, if they exist. Must be empty.
-* @param array $dirs full paths to directories to delete.
+*
+* @param $dirs Array: full paths to directories to delete.
 */
private static function deleteDirs( $dirs ) {
foreach ( $dirs as $dir ) {
@@ -134,7 +138,8 @@
/**
 * Create a dummy uploads directory which will contain a couple
 * of files in order to pass existence tests.
-* @return string The directory
+*
+* @return String: the directory
 */
private function setupUploadDir() {
global $IP;



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

[MediaWiki-CVS] SVN: [68244] trunk/extensions/SemanticResultFormats/Exhibit/exhibit.tar.gz

2010-06-18 Thread fabianh

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

Revision: 68244
Author:   fabianh
Date: 2010-06-18 21:04:10 + (Fri, 18 Jun 2010)

Log Message:
---


Removed Paths:
-
trunk/extensions/SemanticResultFormats/Exhibit/exhibit.tar.gz

Deleted: trunk/extensions/SemanticResultFormats/Exhibit/exhibit.tar.gz
===
(Binary files differ)



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

[MediaWiki-CVS] SVN: [68243] trunk/extensions/SemanticResultFormats/RELEASE-NOTES

2010-06-18 Thread fabianh

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

Revision: 68243
Author:   fabianh
Date: 2010-06-18 21:03:10 + (Fri, 18 Jun 2010)

Log Message:
---


Modified Paths:
--
trunk/extensions/SemanticResultFormats/RELEASE-NOTES

Modified: trunk/extensions/SemanticResultFormats/RELEASE-NOTES
===
--- trunk/extensions/SemanticResultFormats/RELEASE-NOTES2010-06-18 
21:03:08 UTC (rev 68242)
+++ trunk/extensions/SemanticResultFormats/RELEASE-NOTES2010-06-18 
21:03:10 UTC (rev 68243)
@@ -3,15 +3,16 @@
 
 == SRF 1.5 ==
 
-Released on ?
+Released on June 22 2009.
 
 New formats in this version are:
 * gallery (written by Rowan Rodrik van der Molen)
 
 Changes in this version:
-* the functions getName() and getParameters() were added to most formats, for
-  use in Special:Ask
+* the functions getName() and getParameters() were added to most formats, for 
use in Special:Ask
 * a 'lang' parameter was added to the 'calendar' format
+* improvements in 'exhibit' result format
+** new facet styles (slider and search)
 
 == SRF 1.4.5 ==
 



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

[MediaWiki-CVS] SVN: [68242] trunk/extensions/FlaggedRevs/FlaggedArticleView.php

2010-06-18 Thread aaron

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

Revision: 68242
Author:   aaron
Date: 2010-06-18 21:03:08 + (Fri, 18 Jun 2010)

Log Message:
---
* (bug 24029) Check wpReviewEdit input value to make sure the submit button has 
the proper consistent text
* Refactored some code into new editWillRequireReview() function

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedArticleView.php

Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-06-18 20:59:29 UTC 
(rev 68241)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-06-18 21:03:08 UTC 
(rev 68242)
@@ -1563,17 +1563,8 @@
* @TODO: would be nice if hook passed in button attribs, not XML
*/
public function changeSaveButton( EditPage $editPage, array &$buttons ) 
{
-   $title = $this->article->getTitle(); // convenience
-   if ( !$this->article->editsRequireReview() ) {
-   return true; // edit will go live immediatly
-   } elseif ( $title->userCan( 'autoreview' ) ) {
-   if ( FlaggedRevs::autoReviewNewPages() && 
!$this->article->exists() ) {
-   return true; // edit will be autoreviewed anyway
-   }
-   $frev = FlaggedRevision::newFromTitle( $title, 
self::getBaseRevId( $editPage ) );
-   if ( $frev ) {
-   return true; // edit will be autoreviewed anyway
-   }
+   if ( !$this->editWillRequireReview( $editPage ) ) {
+   return true; // edit will go live or be reviewed on save
}
if ( extension_loaded( 'domxml' ) ) {
wfDebug( "Warning: you have the obsolete domxml 
extension for PHP. Please remove it!\n" );
@@ -1593,6 +1584,31 @@
}
 
/**
+   * If submitting this edit will leave it pending
+   * @param EditPage $editPage
+   * @return bool
+   */
+   protected function editWillRequireReview( EditPage $editPage ) {
+   global $wgRequest;
+   $title = $this->article->getTitle(); // convenience
+   if ( !$this->article->editsRequireReview() ) {
+   return false; // edits go live immediatly
+   } elseif ( $wgRequest->getCheck( 'wpReviewEdit' ) && 
$title->userCan( 'review' ) ) {
+   return false; // edit will checked off to be reviewed
+   }
+   if ( $title->userCan( 'autoreview' ) ) {
+   if ( FlaggedRevs::autoReviewNewPages() && 
!$this->article->exists() ) {
+   return false; // edit will be autoreviewed 
anyway
+   }
+   $frev = FlaggedRevision::newFromTitle( $title, 
self::getBaseRevId( $editPage ) );
+   if ( $frev ) {
+   return false; // edit will be autoreviewed 
anyway
+   }
+   }
+   return true; // edit needs review
+   }
+
+   /**
* Add a "review pending changes" checkbox to the edit form if:
* (a) there are currently any revisions pending (bug 16713)
* (b) this is an unreviewed page (bug 23970)



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

[MediaWiki-CVS] SVN: [68241] trunk/extensions/UsabilityInitiative

2010-06-18 Thread adam

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

Revision: 68241
Author:   adam
Date: 2010-06-18 20:59:29 + (Fri, 18 Jun 2010)

Log Message:
---
SimpleSearch adding left margin to the button so the input field's outline is 
not smack up against

Modified Paths:
--
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/css/combined.css
trunk/extensions/UsabilityInitiative/css/combined.min.css
trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css

Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 20:56:11 UTC (rev 68240)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 20:59:29 UTC (rev 68241)
@@ -20,7 +20,7 @@
'raw' => array(
array( 'src' => 'css/suggestions.css', 
'version' => 15 ),
array( 'src' => 
'css/vector.collapsibleNav.css', 'version' => 12 ),
-   array( 'src' => 
'css/vector.expandableSearch.css', 'version' => 5 ),
+   array( 'src' => 
'css/vector.expandableSearch.css', 'version' => 6 ),
array( 'src' => 'css/vector.footerCleanup.css', 
'version' => 2 ),
array( 'src' => 'css/wikiEditor.css', 'version' 
=> 14 ),
array( 'src' => 'css/wikiEditor.dialogs.css', 
'version' => 29 ),
@@ -30,11 +30,11 @@
array( 'src' => 
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'combined' => array(
-   array( 'src' => 'css/combined.css', 'version' 
=> 106 ),
+   array( 'src' => 'css/combined.css', 'version' 
=> 107 ),
array( 'src' => 
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'minified' => array(
-   array( 'src' => 'css/combined.min.css', 
'version' => 106 ),
+   array( 'src' => 'css/combined.min.css', 
'version' => 107 ),
array( 'src' => 
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
)
@@ -83,7 +83,7 @@
array( 'src' => 'js/plugins.combined.js', 
'version' => 436 ),
),
'minified' => array(
-   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 439 ),
+   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 440 ),
),
),
);

Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===
--- trunk/extensions/UsabilityInitiative/css/combined.css   2010-06-18 
20:56:11 UTC (rev 68240)
+++ trunk/extensions/UsabilityInitiative/css/combined.css   2010-06-18 
20:59:29 UTC (rev 68241)
@@ -140,7 +140,7 @@
overflow: auto;
 }
 div#simpleSearch button#searchButton {
-   margin: 5px 5px 0 0;
+   margin: 5px 5px 0 5px;
height: 13px;
width: 12px;
 }

Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===
--- trunk/extensions/UsabilityInitiative/css/combined.min.css   2010-06-18 
20:56:11 UTC (rev 68240)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css   2010-06-18 
20:59:29 UTC (rev 68241)
@@ -138,7 +138,7 @@
 overflow:auto;
 }
 div#simpleSearch button#searchButton{
-margin:5px 5px 0 0;
+margin:5px 5px 0 5px;
 height:13px;
 width:12px;
 }

Modified: trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css
===
--- trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css
2010-06-18 20:56:11 UTC (rev 68240)
+++ trunk/extensions/UsabilityInitiative/css/vector.expandableSearch.css
2010-06-18 20:59:29 UTC (rev 68241)
@@ -5,7 +5,7 @@
overflow: auto;
 }
 div#simpleSearch button#searchButton {
-   margin: 5px 5px 0 0;
+   margin: 5px 5px 0 5px;
height: 13px;
width: 12px;
 }



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

[MediaWiki-CVS] SVN: [68240] trunk/extensions/UsabilityInitiative

2010-06-18 Thread adam

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

Revision: 68240
Author:   adam
Date: 2010-06-18 20:56:11 + (Fri, 18 Jun 2010)

Log Message:
---
SimpleSearch fix for bug 24032

Modified Paths:
--
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php

trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php

Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 20:50:58 UTC (rev 68239)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 20:56:11 UTC (rev 68240)
@@ -83,7 +83,7 @@
array( 'src' => 'js/plugins.combined.js', 
'version' => 436 ),
),
'minified' => array(
-   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 438 ),
+   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 439 ),
),
),
);

Modified: 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
===
--- 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
2010-06-18 20:50:58 UTC (rev 68239)
+++ 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
2010-06-18 20:56:11 UTC (rev 68240)
@@ -50,8 +50,9 @@
'line-height': '13px'
})
.css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 
'left' ), 0 )
-   .click( function() {
+   .mousedown( function() {
$j(this).parent().find( 
'input#searchInput' ).focus();
+   return false;
})
.appendTo( $j(this).parent() );
if ( $j(this).val() == '' ) {

Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
===
--- trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js  
2010-06-18 20:50:58 UTC (rev 68239)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js  
2010-06-18 20:56:11 UTC (rev 68240)
@@ -555,8 +555,9 @@
'line-height': '13px'
})
.css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 
'left' ), 0 )
-   .click( function() {
+   .mousedown( function() {
$j(this).parent().find( 
'input#searchInput' ).focus();
+   return false;
})
.appendTo( $j(this).parent() );
if ( $j(this).val() == '' ) {

Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
===
--- trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js  
2010-06-18 20:50:58 UTC (rev 68239)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js  
2010-06-18 20:56:11 UTC (rev 68240)
@@ -26,7 +26,7 @@
 +' other 
pages.');$j('.mw-templatesUsedExplanation').remove();$j('.collapsible-list
 
label').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('ul').slideToggle('fast');return
 false;}).trigger('click');$j('#wpPreview, #wpDiff, .editHelp, 
#editpage-specialchars').remove();$j('#mw-editform-cancel').remove().appendTo('.editButtons');});if(wgVectorEnabledModules.simplesearch&&skin=='vector'&&typeof
 
os_autoload_inputs!=='undefined'&&os_autoload_forms!=='undefined'){os_autoload_inputs=[];os_autoload_forms=[];}
 
$j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||skin!='vector'){return
 true;}
 var 
mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return
 true;}
-$j('div#simpleSearch > input#searchInput').each(function(){$j('').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','color':'#99','cursor':'text','margin':'0
 
4px','top':'6px','line-height':'13px'}).css(($j('

[MediaWiki-CVS] SVN: [68239] branches/wmf/1.16wmf4/extensions/UsabilityInitiative

2010-06-18 Thread catrope

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

Revision: 68239
Author:   catrope
Date: 2010-06-18 20:50:58 + (Fri, 18 Jun 2010)

Log Message:
---
1.16wmf4: MFT r68238

Modified Paths:
--

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php

Property Changed:

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn/
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.cookie.js

branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.textSelection.js


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative
___
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66337-67741,67743-67744,67776,67839,67995,68003,68020,68023
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,6,65590
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/branches/wmf-deployment/extensions/UsabilityInitiative:60970
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66337-67741,67743-67744,67776,67839,67995,68003,68020,68023,68238
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,6,65590


Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/OptIn
___
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970
/trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/OptIn:60970
/trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62127,62139-62140,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66337-67741,67743-67744,68238
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816


Property changes on: 
branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch
___
Modified: svn:mergeinfo
   - /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-67765,67776,67788
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
   + /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch:51646
/branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch:60970
/trunk/extensions/UsabilityInitiative/PrefSwitch:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-67765,67776,67788,68238
/trunk/phase3/extensions/UsabilityInitiative/PrefSwitch:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,581

[MediaWiki-CVS] SVN: [68238] trunk/extensions/UsabilityInitiative/WikiEditor

2010-06-18 Thread catrope

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

Revision: 68238
Author:   catrope
Date: 2010-06-18 20:47:15 + (Fri, 18 Jun 2010)

Log Message:
---
UsabilityInitiative: Remove the rule saying that anything matcing 
[^.]\.[a-z]{2,](\/|$) is a URL: stuff like "File:Example.jpg" matches this too

Modified Paths:
--
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php

Modified: 
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js  
2010-06-18 20:34:06 UTC (rev 68237)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js  
2010-06-18 20:47:15 UTC (rev 68238)
@@ -997,15 +997,13 @@
// The following things are considered to be 
external links:
// * Starts a URL protocol
// * Starts with www.
-   // * Ends with a . followed by two or more 
letters
-   // * Contains a . followed by two or more 
letters followed by /
-   // All of these are potentially valid titles, 
and the latter three
+   // All of these are potentially valid titles, 
and the latter two
// categories match about 6300 titles in 
enwiki's ns0. Out of 6.9M
// titles, that's 0.09%
if ( typeof arguments.callee.regex == 
'undefined' ) {
// Cache the regex
arguments.callee.regex =
-   new RegExp( "(^(" + 
wgUrlProtocols + "))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))", 'i');
+   new RegExp( "^(" + 
wgUrlProtocols + "|www\\.)", 'i');
}
return s.match( arguments.callee.regex );
}

Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js  
2010-06-18 20:34:06 UTC (rev 68237)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js  
2010-06-18 20:47:15 UTC (rev 68238)
@@ -1046,15 +1046,13 @@
// The following things are considered to be 
external links:
// * Starts a URL protocol
// * Starts with www.
-   // * Ends with a . followed by two or more 
letters
-   // * Contains a . followed by two or more 
letters followed by /
-   // All of these are potentially valid titles, 
and the latter three
+   // All of these are potentially valid titles, 
and the latter two
// categories match about 6300 titles in 
enwiki's ns0. Out of 6.9M
// titles, that's 0.09%
if ( typeof arguments.callee.regex == 
'undefined' ) {
// Cache the regex
arguments.callee.regex =
-   new RegExp( "(^(" + 
wgUrlProtocols + "))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))", 'i');
+   new RegExp( "^(" + 
wgUrlProtocols + "|www\\.)", 'i');
}
return s.match( arguments.callee.regex );
}

Modified: 
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js  
2010-06-18 20:34:06 UTC (rev 68237)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js  
2010-06-18 20:47:15 UTC (rev 68238)
@@ -26,7 +26,7 @@
   \
  \
 \
-   ',init:function(){function isExternalLink(s){if(typeof 
arguments.callee.regex=='undefined'){arguments.callee.regex=new 
RegExp("(^("+wgUrlProtocols+"))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))",'i');}
+   ',init:function(){function isExternalLink(s){if(typeof 
arguments.callee.regex=='undefined'){arguments.callee.regex=new 
RegExp("^("+wgUrlProtocols+"|www\\.)",'i');}
 return s.match(arguments.callee.regex);}
 function 
updateWidget(statu

[MediaWiki-CVS] SVN: [68237] branches/MwEmbedStandAlone

2010-06-18 Thread dale

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

Revision: 68237
Author:   dale
Date: 2010-06-18 20:34:06 + (Fri, 18 Jun 2010)

Log Message:
---
updated the thumbnail reference to update "poster" 

Modified Paths:
--
branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerHtml.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.EmbedPlayerSmil.js
branches/MwEmbedStandAlone/mwEmbed.js

Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js
===
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js2010-06-18 
20:09:20 UTC (rev 68236)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js2010-06-18 
20:34:06 UTC (rev 68237)
@@ -228,9 +228,7 @@
$j( '.videonojs' ).remove();


// Detect supported players:  
-   mw.EmbedTypes.init();   
-   
-   //mw.log(" run callback: " + callback );
+   mw.EmbedTypes.init();   

// Run the callback with name of the module  
if( typeof callback == 'function' ) {

Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-06-18 20:09:20 UTC (rev 68236)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-06-18 20:34:06 UTC (rev 68237)
@@ -280,6 +280,11 @@
$j( mw ).trigger( 'EmbedPlayerManagerReady' );
}

+   // If we have not detected player yet do that: 
+   if( ! mw.EmbedTypes.players ){
+   mw.EmbedTypes.init();
+   }   
+   
// Add the embedPlayer ready callback 
if( typeof callback == 'function' ){  
mw.playerManager.addCallback( callback );
@@ -1962,7 +1967,7 @@
this.controlBuilder.closeMenuOverlay();

// update the thumbnail html: 
-   this.updateThumbnailHTML();
+   this.updatePosterHTML();

this.paused = true;
this.thumbnail_disp = true;
@@ -2004,7 +2009,7 @@
this.$interface = $j( this ).parent( '.interface_wrap' );   


// Update Thumbnail for the "player" 
-   this.updateThumbnailHTML(); 
+   this.updatePosterHTML();

// Add controls if enabled:
if ( this.controls ) {  
@@ -2155,7 +2160,7 @@
}
);
if ( !this.thumbnail_updating ) {
-   this.updateThumbnail( this.last_thumb_url , 
false );
+   this.updatePoster( this.last_thumb_url , false 
);
this.last_thumb_url = null;
}
}
@@ -2177,7 +2182,7 @@
*   true switch happens instantly
*   false / undefined animated cross fade
*/
-   updateThumbnail : function( src, quick_switch ) {
+   updatePosterSrc: function( src, quick_switch ) {
// make sure we don't go to the same url if we are not already 
updating: 
if ( !this.thumbnail_updating && $j( '#img_thumb_' + this.id 
).attr( 'src' ) == src )
return false;
@@ -2227,7 +2232,7 @@
if ( _this.last_thumb_url ) {
var src_url = 
_this.last_thumb_url;
_this.last_thumb_url = 
null;
-   _this.updateThumbnail( 
src_url );
+   _this.updatePosterSrc( 
src_url );
}
} );
}
@@ -2239,8 +2244,8 @@
* playing, configuring the player, inline cmml display, HTML linkback,
* download, and embed code.
*/
-   updateThumbnailHTML: function () {
-   mw.log( 'embedPlayer:updateThumbnailHTML::' + this.id );
+   updatePosterHTML: function () {
+   mw.log

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

2010-06-18 Thread btongminh

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

Revision: 68236
Author:   btongminh
Date: 2010-06-18 20:09:20 + (Fri, 18 Jun 2010)

Log Message:
---
(bug 23465) Don't ignore the predefined destination filename on   
Special:Upload after following a red link

Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/specials/SpecialUpload.php

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-06-18 20:00:27 UTC (rev 68235)
+++ trunk/phase3/RELEASE-NOTES  2010-06-18 20:09:20 UTC (rev 68236)
@@ -200,6 +200,8 @@
 * (bug 16356) Repair dumpInterwiki.inc to use proper normalization.
 * (bug 24006) deleteArchivedRevisions.php maintenance script now longer throws
   a fatal error
+* (bug 23465) Don't ignore the predefined destination filename on 
+  Special:Upload after following a red link
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

Modified: trunk/phase3/includes/specials/SpecialUpload.php
===
--- trunk/phase3/includes/specials/SpecialUpload.php2010-06-18 20:00:27 UTC 
(rev 68235)
+++ trunk/phase3/includes/specials/SpecialUpload.php2010-06-18 20:09:20 UTC 
(rev 68236)
@@ -1035,7 +1035,10 @@
$scriptVars = array(
'wgAjaxUploadDestCheck' => $useAjaxDestCheck,
'wgAjaxLicensePreview' => $useAjaxLicensePreview,
-   'wgUploadAutoFill' => !$this->mForReUpload,
+   'wgUploadAutoFill' => !$this->mForReUpload &&
+   // If we received mDestFile from the request, 
don't autofill
+   // the wpDestFile textbox
+   $this->mDestFile === '',
'wgUploadSourceIds' => $this->mSourceIds,
);
 



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

[MediaWiki-CVS] SVN: [68235] trunk/phase3/includes/filerepo

2010-06-18 Thread btongminh

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

Revision: 68235
Author:   btongminh
Date: 2010-06-18 20:00:27 + (Fri, 18 Jun 2010)

Log Message:
---
(bug 23666) FileRepo: Moved File::isLocal() to FileRepo::isLocal(). Patch by 
Umherirrender

Modified Paths:
--
trunk/phase3/includes/filerepo/File.php
trunk/phase3/includes/filerepo/FileRepo.php

Modified: trunk/phase3/includes/filerepo/File.php
===
--- trunk/phase3/includes/filerepo/File.php 2010-06-18 19:53:02 UTC (rev 
68234)
+++ trunk/phase3/includes/filerepo/File.php 2010-06-18 20:00:27 UTC (rev 
68235)
@@ -911,7 +911,8 @@
 * @return bool
 */
function isLocal() {
-   return $this->getRepoName() == 'local';
+   $repo = $this->getRepo();
+   return $repo && $repo->isLocal();
}
 
/**

Modified: trunk/phase3/includes/filerepo/FileRepo.php
===
--- trunk/phase3/includes/filerepo/FileRepo.php 2010-06-18 19:53:02 UTC (rev 
68234)
+++ trunk/phase3/includes/filerepo/FileRepo.php 2010-06-18 20:00:27 UTC (rev 
68235)
@@ -621,7 +621,7 @@
 */
public function getDisplayName() {
// We don't name our own repo, return nothing
-   if ( $this->name == 'local' ) {
+   if ( $this->isLocal() ) {
return null;
}
// 'shared-repo-name-wikimediacommons' is used when 
$wgUseInstantCommons = true
@@ -633,6 +633,16 @@
}
 
/**
+* Returns true if this the local file repository.
+*
+* @return bool
+*/
+   function isLocal() {
+   return $this->getName() == 'local';
+   }
+
+
+   /**
 * Get a key on the primary cache for this repository.
 * Returns false if the repository's cache is not accessible at this 
site.
 * The parameters are the parts of the key, as for wfMemcKey().



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

[MediaWiki-CVS] SVN: [68234] trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php

2010-06-18 Thread btongminh

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

Revision: 68234
Author:   btongminh
Date: 2010-06-18 19:53:02 + (Fri, 18 Jun 2010)

Log Message:
---
(bug 23931) Put GlobalUsage link in the proper position in the filetoc

Modified Paths:
--
trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php

Modified: trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php
===
--- trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php  2010-06-18 
19:43:09 UTC (rev 68233)
+++ trunk/extensions/GlobalUsage/GlobalUsageImagePageHooks.php  2010-06-18 
19:53:02 UTC (rev 68234)
@@ -71,8 +71,11 @@
 * Show a link to the global image links in the TOC if there are any 
results available.
 */
public static function onImagePageShowTOC( $imagePage, &$toc ) {
-   if ( self::hasResults( $imagePage ) )
-   $toc[] = '' . wfMsgHtml( 
'globalusage' ) . '';
+   if ( self::hasResults( $imagePage ) ) {
+   # Insert a link after the 3rd entry in the TOC
+   array_splice( $toc, 3, 0, '' 
+   . wfMsgHtml( 'globalusage' ) . '');
+   }
return true;
}




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

[MediaWiki-CVS] SVN: [68233] trunk/extensions/FlaggedRevs/FlaggedArticle.php

2010-06-18 Thread aaron

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

Revision: 68233
Author:   aaron
Date: 2010-06-18 19:43:09 + (Fri, 18 Jun 2010)

Log Message:
---
Fixed clear(): $this->file not used anymore

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedArticle.php

Modified: trunk/extensions/FlaggedRevs/FlaggedArticle.php
===
--- trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-06-18 19:39:08 UTC 
(rev 68232)
+++ trunk/extensions/FlaggedRevs/FlaggedArticle.php 2010-06-18 19:43:09 UTC 
(rev 68233)
@@ -41,7 +41,7 @@
$this->stableRev = null;
$this->pendingRevs = null;
$this->pageConfig = null;
-   $this->file = null;
+   $this->imagePage = null;
parent::clear();
}
 



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

[MediaWiki-CVS] SVN: [68232] trunk/phase3/includes/Article.php

2010-06-18 Thread maxsem

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

Revision: 68232
Author:   maxsem
Date: 2010-06-18 19:39:08 + (Fri, 18 Jun 2010)

Log Message:
---
Fixed hit counter on SQLite

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

Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php   2010-06-18 19:21:04 UTC (rev 68231)
+++ trunk/phase3/includes/Article.php   2010-06-18 19:39:08 UTC (rev 68232)
@@ -4048,8 +4048,9 @@
$pageTable = $dbw->tableName( 'page' );
$hitcounterTable = $dbw->tableName( 'hitcounter' );
$acchitsTable = $dbw->tableName( 'acchits' );
+   $dbType = $dbw->getType();
 
-   if ( $wgHitcounterUpdateFreq <= 1 ) {
+   if ( $wgHitcounterUpdateFreq <= 1 || $dbType == 'sqlite' ) {
$dbw->query( "UPDATE $pageTable SET page_counter = 
page_counter + 1 WHERE page_id = $id" );
 
return;
@@ -4076,7 +4077,6 @@
wfProfileIn( 'Article::incViewCount-collect' );
$old_user_abort = ignore_user_abort( true );
 
-   $dbType = $dbw->getType();
$dbw->lockTables( array(), array( 'hitcounter' ), 
__METHOD__, false );
$tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : '';
$dbw->query( "CREATE TEMPORARY TABLE $acchitsTable 
$tabletype AS " .



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

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

2010-06-18 Thread daniel

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

Revision: 68231
Author:   daniel
Date: 2010-06-18 19:21:04 + (Fri, 18 Jun 2010)

Log Message:
---
follop-up to 68230: forgot to commit the styles needed for layout grids

Modified Paths:
--
trunk/phase3/includes/parser/Parser.php
trunk/phase3/skins/common/shared.css

Modified: trunk/phase3/includes/parser/Parser.php
===
--- trunk/phase3/includes/parser/Parser.php 2010-06-18 19:17:17 UTC (rev 
68230)
+++ trunk/phase3/includes/parser/Parser.php 2010-06-18 19:21:04 UTC (rev 
68231)
@@ -836,9 +836,9 @@
$td_tag = 'div';
$caption_tag = 'div';
 
-   $extra_table_attribs = array( 'class' 
=> 'grid-table', 'style' => 'display:table;' );
-   $extra_tr_attribs = array( 'class' => 
'grid-row', 'style' => 'display:table-row;' );
-   $extra_td_attribs = array( 'class' => 
'grid-cell', 'style' => 'display:table-cell;' );
+   $extra_table_attribs = array( 'class' 
=> 'grid-table' );
+   $extra_tr_attribs = array( 'class' => 
'grid-row' );
+   $extra_td_attribs = array( 'class' => 
'grid-cell' );
 
$convert_style = true;
} 

Modified: trunk/phase3/skins/common/shared.css
===
--- trunk/phase3/skins/common/shared.css2010-06-18 19:17:17 UTC (rev 
68230)
+++ trunk/phase3/skins/common/shared.css2010-06-18 19:21:04 UTC (rev 
68231)
@@ -877,3 +877,16 @@
 a.sortheader {
margin: 0 0.3em;
 }
+
+.grid-table {
+   display: table;
+}
+
+.grid-row {
+   display: table-row;
+}
+
+.grid-cell {
+   display: table-cell;
+   padding: 0.33ex;
+}



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

[MediaWiki-CVS] SVN: [68230] trunk/phase3/includes

2010-06-18 Thread daniel

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

Revision: 68230
Author:   daniel
Date: 2010-06-18 19:17:17 + (Fri, 18 Jun 2010)

Log Message:
---
let mode="grid" on a wiki table trigger output as div soup instead of a html 
table. this should get rid of "layout tables" that confuse screen readers etc. 
this is very experimental - feel free to revert, i just want to have this diff 
in the repository, to play with...

Modified Paths:
--
trunk/phase3/includes/Sanitizer.php
trunk/phase3/includes/parser/Parser.php

Modified: trunk/phase3/includes/Sanitizer.php
===
--- trunk/phase3/includes/Sanitizer.php 2010-06-18 18:28:02 UTC (rev 68229)
+++ trunk/phase3/includes/Sanitizer.php 2010-06-18 19:17:17 UTC (rev 68230)
@@ -793,6 +793,51 @@
}
}
 
+   /** 
+   * Take an associative array of attribute name/value pairs
+   * and generate a css style representing all the style-related
+   * attributes. If there already a style attribute in the array,
+   * it is also included in the value returned.
+   */
+   static function styleFromAttributes( $attributes ) {
+   $styles = array();
+
+   foreach ( $attributes as $attribute => $value ) {
+   if ( $attribute == 'bgcolor' ) {
+   $styles[] = "background-color: $value";
+   } else if ( $attribute == 'border' ) {
+   $styles[] = "border-width: $value";
+   } else if ( $attribute == 'align' ) {
+   $styles[] = "text-align: $value";
+   } else if ( $attribute == 'valign' ) {
+   $styles[] = "vertical-align: $value";
+   } else if ( $attribute == 'width' ) {
+   if ( preg_match( '/\d+/', $value ) === false ) {
+ $value .= 'px';
+   }
+
+   $styles[] = "width: $value";
+   } else if ( $attribute == 'height' ) {
+   if ( preg_match( '/\d+/', $value ) === false ) {
+ $value .= 'px';
+   }
+
+   $styles[] = "height: $value";
+   } else if ( $attribute == 'nowrap' ) {
+   if ( $value ) {
+   $styles[] = "white-space: nowrap";
+   }
+   }
+   }
+
+   if ( isset( $attributes[ 'style' ] ) ) {
+   $styles[] = $attributes[ 'style' ];
+   } 
+
+   if ( !$styles ) return '';
+   else return implode( '; ', $styles );
+   }
+
/**
 * Take a tag soup fragment listing an HTML element's attributes
 * and normalize it to well-formed XML, discarding unwanted attributes.
@@ -810,24 +855,66 @@
 *
 * @param $text String
 * @param $element String
+* @param $defaults Array (optional) associative array of default 
attributes to splice in. 
+*  class and style attributes are combined. 
Otherwise, values from
+*  $attributes take precedence over values from 
$defaults.
 * @return String
 */
-   static function fixTagAttributes( $text, $element ) {
+   static function fixTagAttributes( $text, $element, $defaults = null ) {
if( trim( $text ) == '' ) {
return '';
}
 
-   $stripped = Sanitizer::validateTagAttributes(
-   Sanitizer::decodeTagAttributes( $text ), $element );
+   $decoded = Sanitizer::decodeTagAttributes( $text );
+   $stripped = Sanitizer::validateTagAttributes( $decoded, 
$element );
+   $attribs = Sanitizer::collapseTagAttributes( $stripped, 
$defaults );
 
-   $attribs = array();
-   foreach( $stripped as $attribute => $value ) {
+   return $attribs;
+   }
+
+   /**
+* Take an associative array or attribute name/value pairs
+* and collapses it to well-formed XML.
+* Does not filter attributes.
+* Output is safe for further wikitext processing, with escaping of
+* values that could trigger problems.
+*
+* - Double-quotes all attribute values
+* - Prepends space if there are attributes.
+*
+* @param $attributes Array is an associative array of attribute 
name/value pairs. 
+*  Assumed to be sanitized already.
+* @param $defaults Array (optional) associative array of default 
attributes to splice in. 
+*

[MediaWiki-CVS] SVN: [68229] trunk/extensions/UsabilityInitiative/Vector

2010-06-18 Thread catrope

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

Revision: 68229
Author:   catrope
Date: 2010-06-18 18:28:02 + (Fri, 18 Jun 2010)

Log Message:
---
UsabilityInitiative: (bug 22680) Make EditWarning no longer break Firefox's 
page caching by setting window,onbeforeunload to null inside the onbeforeunload 
function and restoring it in a pageshow hook. Thanks to Cacycle for finding out 
about this trick

Modified Paths:
--

trunk/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php

Modified: 
trunk/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js
===
--- 
trunk/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js  
2010-06-18 18:06:16 UTC (rev 68228)
+++ 
trunk/extensions/UsabilityInitiative/Vector/Modules/EditWarning/EditWarning.js  
2010-06-18 18:28:02 UTC (rev 68229)
@@ -10,9 +10,10 @@
$j(this).data( 'origtext', $j(this).val() );
});
// Attach our own handler for onbeforeunload which respects the current 
one
-   fallbackWindowOnBeforeUnload = window.onbeforeunload;
-   window.onbeforeunload = function() {
+   var fallbackWindowOnBeforeUnload = window.onbeforeunload;
+   var ourWindowOnBeforeUnload = function() {
var fallbackResult = undefined;
+   var retval = undefined;
// Check if someone already set on onbeforeunload hook
if ( fallbackWindowOnBeforeUnload ) {
// Get the result of their onbeforeunload hook
@@ -21,19 +22,37 @@
// Check if their onbeforeunload hook returned something
if ( fallbackResult !== undefined ) {
// Exit here, returning their message
-   return fallbackResult;
+   retval = fallbackResult;
+   } else {
+   // Check if the current values of some form elements 
are the same as
+   // the original values
+   if (
+   wgAction == 'submit' ||
+   $j( '#wpTextbox1' ).data( 'origtext' ) != $j( 
'#wpTextbox1' ).val() ||
+   $j( '#wpSummary' ).data( 'origtext' ) != $j( 
'#wpSummary' ).val()
+   ) {
+   // Return our message
+   retval = mw.usability.getMsg( 
'vector-editwarning-warning' );
+   }
}
-   // Check if the current values of some form elements are the 
same as
-   // the original values
-   if(
-   wgAction == 'submit' ||
-   $j( '#wpTextbox1' ).data( 'origtext' ) != $j( 
'#wpTextbox1' ).val() ||
-   $j( '#wpSummary' ).data( 'origtext' ) != $j( 
'#wpSummary' ).val()
-   ) {
-   // Return our message
-   return mw.usability.getMsg( 
'vector-editwarning-warning' );
+   
+   // Unset the onbeforeunload handler so we don't break page 
caching in Firefox
+   window.onbeforeunload = null;
+   if ( retval !== undefined ) {
+   return retval;
}
+   };
+   var pageShowHandler = function() {
+   // Re-add onbeforeunload handler
+   window.onbeforeunload = ourWindowOnBeforeUnload;
+   };
+   pageShowHandler();
+   if ( window.addEventListener ) {
+   window.addEventListener('pageshow', pageShowHandler, false);
+   } else if ( window.attachEvent ) {
+   window.attachEvent( 'pageshow', pageShowHandler );
}
+   
// Add form submission handler
$j( 'form' ).submit( function() {
// Restore whatever previous onbeforeload hook existed

Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
===
--- trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js  
2010-06-18 18:06:16 UTC (rev 68228)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js  
2010-06-18 18:28:02 UTC (rev 68229)
@@ -308,9 +308,10 @@
$j(this).data( 'origtext', $j(this).val() );
});
// Attach our own handler for onbeforeunload which respects the current 
one
-   fallbackWindowOnBeforeUnload = window.onbeforeunload;
-   window.onbeforeunload = function() {
+   var fallbackWindowOnBeforeUnload = window.onbeforeunload;
+   var ourWindowOnBeforeUnload = function() {

[MediaWiki-CVS] SVN: [68228] trunk/extensions/UsabilityInitiative/ClickTracking/ ApiClickTracking.php

2010-06-18 Thread catrope

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

Revision: 68228
Author:   catrope
Date: 2010-06-18 18:06:16 + (Fri, 18 Jun 2010)

Log Message:
---
Followup to r67278: use [0] not {0} for string indexing per CR. Decided against 
using strspn() to make the correspondence with the validation rule in JS more 
obvious

Modified Paths:
--
trunk/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php

Modified: 
trunk/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php
===
--- trunk/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php 
2010-06-18 18:04:14 UTC (rev 68227)
+++ trunk/extensions/UsabilityInitiative/ClickTracking/ApiClickTracking.php 
2010-06-18 18:06:16 UTC (rev 68228)
@@ -60,8 +60,9 @@
if ( !is_null( $params['redirectto'] ) ) {
// Validate the redirectto parameter
// Must be a local URL, may not be protocol-relative
+   // This validation rule is the same as the one in 
ClickTracking.js
$href = $params['redirectto'];
-   if ( strlen( $href ) > 0 && $href{0} == '/' && ( 
strlen( $href ) == 1 || $href{1} != '/' ) ) {
+   if ( strlen( $href ) > 0 && $href[0] == '/' && ( 
strlen( $href ) == 1 || $href[1] != '/' ) ) {
global $wgOut;
$wgOut->redirect( $params['redirectto'] );
$wgOut->output();



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

[MediaWiki-CVS] SVN: [68227] trunk/extensions/Configure

2010-06-18 Thread ialex

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

Revision: 68227
Author:   ialex
Date: 2010-06-18 18:04:14 + (Fri, 18 Jun 2010)

Log Message:
---
Updated CentralNotice, CommentPages and Translate extensions

Modified Paths:
--
trunk/extensions/Configure/CHANGELOG
trunk/extensions/Configure/Configure.php
trunk/extensions/Configure/settings/Settings-ext.txt

Modified: trunk/extensions/Configure/CHANGELOG
===
--- trunk/extensions/Configure/CHANGELOG2010-06-18 18:00:54 UTC (rev 
68226)
+++ trunk/extensions/Configure/CHANGELOG2010-06-18 18:04:14 UTC (rev 
68227)
@@ -1,6 +1,9 @@
 This file lists changes on this extension. Localisation updates are done
 through translatewiki.net and are not listed here.
 
+0.15.31 - 18 June 2010
+  Updated CentralNotice, CommentPages and Translate extensions.
+
 0.15.30 - 9 June 2010
   Updated Collection extension.
 

Modified: trunk/extensions/Configure/Configure.php
===
--- trunk/extensions/Configure/Configure.php2010-06-18 18:00:54 UTC (rev 
68226)
+++ trunk/extensions/Configure/Configure.php2010-06-18 18:04:14 UTC (rev 
68227)
@@ -17,7 +17,7 @@
'author' => array( 'Alexandre Emsenhuber', 'Andrew Garrett' ),
'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
'descriptionmsg' => 'configure-desc',
-   'version' => '0.15.30',
+   'version' => '0.15.31',
 );
 
 # Configuration part

Modified: trunk/extensions/Configure/settings/Settings-ext.txt
===
--- trunk/extensions/Configure/settings/Settings-ext.txt2010-06-18 
18:00:54 UTC (rev 68226)
+++ trunk/extensions/Configure/settings/Settings-ext.txt2010-06-18 
18:04:14 UTC (rev 68227)
@@ -188,7 +188,8 @@
 url = http://www.mediawiki.org/wiki/Extension:CentralAuth
 
 CentralNotice
-settings[] = wgNoticeCentralPath: text, wgNoticeLocalPath: text
+settings[] = wgNoticeCentralPath: text, wgNoticeUseLocalNotice: bool
+settings[] = wgNoticeLocalPath: text
 settings[] = wgNoticeLang: text, wgNoticeProject: text, wgNoticeProjects: array
 settings[] = wgNoticeCentralDirectory: text, wgNoticeLocalDirectory: text
 settings[] = wgNoticeInfrastructure: bool, wgCentralNoticeLoader: bool
@@ -285,7 +286,7 @@
 url = http://www.mediawiki.org/wiki/Extension:Commentbox
 
 CommentPages
-settings[] = wgCommentPagesNS: int
+settings[] = wgCommentPagesNS: int, wgCommentPagesContentNamespace: int
 url = http://www.mediawiki.org/wiki/Extension:CommentPages
 
 CommentSpammer
@@ -834,19 +835,16 @@
 settings[] = wgTranslateGroupStructure: array, 
wgTranslateAddMWExtensionGroups: bool
 settings[] = wgTranslateEC: array, wgTranslateCC: array, wgTranslateTasks: 
array
 settings[] = wgTranslatePHPlot: text, wgTranslatePHPlotFont: text
-settings[] = wgTranslateYamlLibrary: text
-settings[] = wgTranslateGroupRoot: text, wgTranslateGroupFiles: array
-settings[] = wgGoogleApiKey: text, wgTranslateTM: array
-settings[] = wgTranslateApertium: text
+settings[] = wgTranslateYamlLibrary: text,wgTranslateGroupRoot: text
+settings[] = wgTranslateGroupFiles: array, wgTranslateTranslationServices: 
array
 array[] = wgTranslateStaticTags: assoc
 array[] = wgTranslateLanguageFallbacks: assoc, wgTranslateBlacklist: array
 array[] = wgTranslateMessageNamespaces: ns-simple, wgTranslateAuthorBlacklist: 
array
 array[] = wgTranslateAC: assoc, wgTranslateGroupStructure: array
 array[] = wgTranslateEC: simple, wgTranslateCC: assoc
 array[] = wgTranslateTasks: assoc, wgTranslateGroupFiles: simple
-array[] = wgTranslateTM: assoc
-empty[] = wgTranslateStaticTags: false, wgTranslateTM: false
-empty[] = wgGoogleApiKey: false, wgTranslateApertium: false
+array[] = wgTranslateTranslationServices: array
+empty[] = wgTranslateStaticTags: false
 url = http://www.mediawiki.org/wiki/Extension:Translate
 
 Uniwiki - Authors



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

[MediaWiki-CVS] SVN: [68226] trunk/extensions/Translate/tag/SpecialPageTranslation.php

2010-06-18 Thread nikerabbit

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

Revision: 68226
Author:   nikerabbit
Date: 2010-06-18 18:00:54 + (Fri, 18 Jun 2010)

Log Message:
---
Tests would be nice...

Modified Paths:
--
trunk/extensions/Translate/tag/SpecialPageTranslation.php

Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php   2010-06-18 
18:00:54 UTC (rev 68225)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php   2010-06-18 
18:00:54 UTC (rev 68226)
@@ -500,7 +500,7 @@
);
$logger->addEntry( 'mark', $page->getTitle(), null, array( 
serialize( $params ) ) );
 
-   $page->getTitle()-invalidateCache();
+   $page->getTitle()->invalidateCache();
$this->setupRenderJobs( $page );
 
// Re-generate caches



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

[MediaWiki-CVS] SVN: [68225] trunk/phase3/includes

2010-06-18 Thread catrope

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

Revision: 68225
Author:   catrope
Date: 2010-06-18 18:00:54 + (Fri, 18 Jun 2010)

Log Message:
---
Followup to r67554: move getAcceptLang() to WebRequest for general use, per CR.

Modified Paths:
--
trunk/phase3/includes/WebRequest.php
trunk/phase3/includes/api/ApiQueryUserInfo.php

Modified: trunk/phase3/includes/WebRequest.php
===
--- trunk/phase3/includes/WebRequest.php2010-06-18 17:36:54 UTC (rev 
68224)
+++ trunk/phase3/includes/WebRequest.php2010-06-18 18:00:54 UTC (rev 
68225)
@@ -736,6 +736,37 @@
$ext = substr( $pi, $dotPos );
return !in_array( $ext, array( $wgScriptExtension, '.php', 
'.php5' ) );
}
+   
+   /**
+* Parse the Accept-Language header sent by the client into an array
+* @return array( languageCode => q-value ) sorted by q-value in 
descending order
+*/
+   public function getAcceptLang() {
+   // Modified version of code found at 
http://www.thefutureoftheweb.com/blog/use-accept-language-header
+   if ( !isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ) {
+   return array();
+   }
+   
+   // Break up string into pieces (languages and q factors)
+   $lang_parse = null;
+   preg_match_all( 
'/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0(\.[0-9]+))?)?/i',
+   $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse );
+   
+   if ( !count( $lang_parse[1] ) ) {
+   return array();
+   }
+   // Create a list like "en" => 0.8
+   $langs = array_combine( $lang_parse[1], $lang_parse[4] );
+   // Set default q factor to 1
+   foreach ( $langs as $lang => $val ) {
+   if ( $val === '' ) {
+   $langs[$lang] = 1;
+   }
+   }
+   // Sort list
+   arsort( $langs, SORT_NUMERIC );
+   return $langs;
+   }
 }
 
 /**

Modified: trunk/phase3/includes/api/ApiQueryUserInfo.php
===
--- trunk/phase3/includes/api/ApiQueryUserInfo.php  2010-06-18 17:36:54 UTC 
(rev 68224)
+++ trunk/phase3/includes/api/ApiQueryUserInfo.php  2010-06-18 18:00:54 UTC 
(rev 68225)
@@ -54,7 +54,7 @@
}
 
protected function getCurrentUserInfo() {
-   global $wgUser;
+   global $wgUser, $wgRequest;
$result = $this->getResult();
$vals = array();
$vals['id'] = intval( $wgUser->getId() );
@@ -125,46 +125,18 @@
}

if ( isset( $this->prop['acceptlang'] ) ) {
-   $vals['acceptlang'] = $this->getAcceptLang();
-   $result->setIndexedTagName( $vals['acceptlang'], 'lang' 
);
+   $langs = $wgRequest->getAcceptLang();
+   $acceptLang = array();
+   foreach ( $langs as $lang => $val ) {
+   $r = array( 'q' => $val );
+   ApiResult::setContent( $r, $lang );
+   $acceptLang[] = $r;
+   }
+   $result->setIndexedTagName( $acceptLang, 'lang' );
+   $vals['acceptlang'] = $acceptLang;
}
return $vals;
}
-   
-   protected function getAcceptLang() {
-   // Modified version of code found at 
http://www.thefutureoftheweb.com/blog/use-accept-language-header
-   if ( !isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ) {
-   return array();
-   }
-   
-   // Break up string into pieces (languages and q factors)
-   $lang_parse = null;
-   preg_match_all( 
'/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0(\.[0-9]+))?)?/i',
-   $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse );
-   
-   if ( !count( $lang_parse[1] ) ) {
-   return array();
-   }
-   // Create a list like "en" => 0.8
-   $langs = array_combine( $lang_parse[1], $lang_parse[4] );
-   // Set default q factor to 1
-   foreach ( $langs as $lang => $val ) {
-   if ( $val === '' ) {
-   $langs[$lang] = 1;
-   }
-   }
-   // Sort list
-   arsort( $langs, SORT_NUMERIC );
-   
-   // Format for API output
-   $retval = array();
-   foreach ( $langs as $lang => $val ) {
-

[MediaWiki-CVS] SVN: [68224] trunk

2010-06-18 Thread catrope

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

Revision: 68224
Author:   catrope
Date: 2010-06-18 17:36:54 + (Fri, 18 Jun 2010)

Log Message:
---
Followup to r68177: per CR, move SimpleSearch preference to core.

Modified Paths:
--

trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
trunk/phase3/includes/Preferences.php
trunk/phase3/languages/messages/MessagesEn.php

Modified: 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
===
--- 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
  2010-06-18 17:32:56 UTC (rev 68223)
+++ 
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.i18n.php
  2010-06-18 17:36:54 UTC (rev 68224)
@@ -14,7 +14,6 @@
 $messages['en'] = array(
'vector-simplesearch-search' => 'Search',
'vector-simplesearch-containing' => 'containing...',
-   'vector-simplesearch-preference' => 'Enable enhanced search suggestions 
(Vector skin only)',
 );
 
 /** Message documentation (Message documentation)

Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
===
--- trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
2010-06-18 17:32:56 UTC (rev 68223)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
2010-06-18 17:36:54 UTC (rev 68224)
@@ -74,11 +74,6 @@
'preferences' => array(
'enable' => array(
'key' => 'vector-simplesearch',
-   'ui' => array(
-   'type' => 'toggle',
-   'label-message' => 
'vector-simplesearch-preference',
-   'section' => 
'searchoptions/display'
-   ),
),
'disablesuggest' => array(
'key' => 'disablesuggest',

Modified: trunk/phase3/includes/Preferences.php
===
--- trunk/phase3/includes/Preferences.php   2010-06-18 17:32:56 UTC (rev 
68223)
+++ trunk/phase3/includes/Preferences.php   2010-06-18 17:36:54 UTC (rev 
68224)
@@ -923,6 +923,15 @@
'section' => 'searchoptions/display',
);
}
+   
+   global $wgVectorUseSimpleSearch;
+   if ( $wgVectorUseSimpleSearch ) {
+   $defaultPreferences['vector-simplesearch'] = array(
+   'type' => 'toggle',
+   'label-message' => 
'vector-simplesearch-preference',
+   'section' => 'searchoptions/display'
+   );
+   }
 
$defaultPreferences['searcheverything'] = array(
'type' => 'toggle',

Modified: trunk/phase3/languages/messages/MessagesEn.php
===
--- trunk/phase3/languages/messages/MessagesEn.php  2010-06-18 17:32:56 UTC 
(rev 68223)
+++ trunk/phase3/languages/messages/MessagesEn.php  2010-06-18 17:36:54 UTC 
(rev 68224)
@@ -796,6 +796,7 @@
 'vector-namespace-talk'  => 'Discussion',
 'vector-namespace-template'  => 'Template',
 'vector-namespace-user'  => 'User page',
+'vector-simplesearch-preference' => 'Enable enhanced search suggestions 
(Vector skin only)',
 'vector-view-create' => 'Create',
 'vector-view-edit'   => 'Edit',
 'vector-view-history'=> 'View history',



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

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

2010-06-18 Thread ialex

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

Revision: 68223
Author:   ialex
Date: 2010-06-18 17:32:56 + (Fri, 18 Jun 2010)

Log Message:
---
removed unused globals

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

Modified: trunk/extensions/Maps/Maps.php
===
--- trunk/extensions/Maps/Maps.php  2010-06-18 17:18:39 UTC (rev 68222)
+++ trunk/extensions/Maps/Maps.php  2010-06-18 17:32:56 UTC (rev 68223)
@@ -78,9 +78,9 @@
  * Initialization function for the Maps extension.
  */
 function efMapsSetup() {
-   global $wgExtensionCredits, $wgLang, $wgAutoloadClasses, $IP, 
$wgStyleVersion, $wgScriptPath,  $wgJsMimeType, $wgExtensionAssetsPath;
-   global $egMapsDefaultService, $egMapsAvailableServices, 
$egMapsServices, $egMapsDefaultGeoService, $egMapsScriptPath;
-   global $egMapsDir, $egMapsAvailableFeatures, $egMapsUseMinJs, 
$egMapsJsExt, $egMapsStyleVersion;
+   global $wgExtensionCredits, $wgLang, $wgAutoloadClasses;
+   global $egMapsDefaultService, $egMapsAvailableServices, $egMapsServices;
+   global $egMapsDir, $egMapsUseMinJs, $egMapsJsExt;
 
// Autoload the includes/ classes.
$wgAutoloadClasses['MapsMapper']= 
$egMapsDir . 'Includes/Maps_Mapper.php';
@@ -97,7 +97,7 @@
require_once $egMapsDir . 'Services/Maps_iMappingService.php';
$wgAutoloadClasses['MapsMappingService'] = $egMapsDir . 
'Services/Maps_MappingService.php';

-   wfRunHooks( 'MappingServiceLoad' ); 
+   wfRunHooks( 'MappingServiceLoad' );

wfRunHooks( 'MappingFeatureLoad' );
 



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

[MediaWiki-CVS] SVN: [68222] branches/wmf/1.16wmf4

2010-06-18 Thread catrope

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

Revision: 68222
Author:   catrope
Date: 2010-06-18 17:18:39 + (Fri, 18 Jun 2010)

Log Message:
---
1.16wmf4: MFT r65380, r65381

Modified Paths:
--
branches/wmf/1.16wmf4/includes/DefaultSettings.php
branches/wmf/1.16wmf4/skins/vector/main-ltr.css
branches/wmf/1.16wmf4/skins/vector/main-rtl.css

Property Changed:

branches/wmf/1.16wmf4/skins/vector/

Modified: branches/wmf/1.16wmf4/includes/DefaultSettings.php
===
--- branches/wmf/1.16wmf4/includes/DefaultSettings.php  2010-06-18 17:03:12 UTC 
(rev 68221)
+++ branches/wmf/1.16wmf4/includes/DefaultSettings.php  2010-06-18 17:18:39 UTC 
(rev 68222)
@@ -1687,7 +1687,7 @@
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '282';
+$wgStyleVersion = '283';
 
 
 # Server-side caching:


Property changes on: branches/wmf/1.16wmf4/skins/vector
___
Modified: svn:mergeinfo
   - /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65383,65387,65391,6,65590-65591,65965,66151,66158,66614,67537,67544,67576,67631,67640,67703,67871
   + /branches/wmf-deployment/skins/vector:60970
/trunk/phase3/skins/vector:63545-63546,63549,63643,63764,63897-63901,64456,65015,65380,65383,65387,65391,6,65590-65591,65965,66151,66158,66614,67537,67544,67576,67631,67640,67703,67871

Modified: branches/wmf/1.16wmf4/skins/vector/main-ltr.css
===
--- branches/wmf/1.16wmf4/skins/vector/main-ltr.css 2010-06-18 17:03:12 UTC 
(rev 68221)
+++ branches/wmf/1.16wmf4/skins/vector/main-ltr.css 2010-06-18 17:18:39 UTC 
(rev 68222)
@@ -35,6 +35,7 @@
background-position: top left;
background-repeat: repeat-y;
background-color: white;
+   color: black;
 }
 /* Head */
 #mw-page-base {

Modified: branches/wmf/1.16wmf4/skins/vector/main-rtl.css
===
--- branches/wmf/1.16wmf4/skins/vector/main-rtl.css 2010-06-18 17:03:12 UTC 
(rev 68221)
+++ branches/wmf/1.16wmf4/skins/vector/main-rtl.css 2010-06-18 17:18:39 UTC 
(rev 68222)
@@ -35,6 +35,7 @@
background-position: top right;
background-repeat: repeat-y;
background-color: white;
+   color: black;
 }
 /* Head */
 #mw-page-base {



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

[MediaWiki-CVS] SVN: [68221] trunk/extensions/InterwikiIntegration

2010-06-18 Thread ialex

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

Revision: 68221
Author:   ialex
Date: 2010-06-18 17:03:12 + (Fri, 18 Jun 2010)

Log Message:
---
svn:eol-style native

Property Changed:

trunk/extensions/InterwikiIntegration/interwikiintegration-recentchanges.sql
trunk/extensions/InterwikiIntegration/interwikiintegration-watchlist.sql


Property changes on: 
trunk/extensions/InterwikiIntegration/interwikiintegration-recentchanges.sql
___
Added: svn:eol-style
   + native


Property changes on: 
trunk/extensions/InterwikiIntegration/interwikiintegration-watchlist.sql
___
Added: svn:eol-style
   + native



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

[MediaWiki-CVS] SVN: [68220] trunk/extensions/Collection/Collection.hooks.php

2010-06-18 Thread maxsem

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

Revision: 68220
Author:   maxsem
Date: 2010-06-18 16:53:20 + (Fri, 18 Jun 2010)

Log Message:
---
Collection: fixed E_STRICT

Modified Paths:
--
trunk/extensions/Collection/Collection.hooks.php

Modified: trunk/extensions/Collection/Collection.hooks.php
===
--- trunk/extensions/Collection/Collection.hooks.php2010-06-18 15:59:18 UTC 
(rev 68219)
+++ trunk/extensions/Collection/Collection.hooks.php2010-06-18 16:53:20 UTC 
(rev 68220)
@@ -38,7 +38,7 @@
return true;
}
 
-   function buildNavUrls( $skin, &$navUrls ) {
+   static function buildNavUrls( $skin, &$navUrls ) {
global $wgUser;
global $wgCollectionPortletForLoggedInUsersOnly;




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

[MediaWiki-CVS] SVN: [68219] trunk/extensions/UsabilityInitiative

2010-06-18 Thread adam

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

Revision: 68219
Author:   adam
Date: 2010-06-18 15:59:18 + (Fri, 18 Jun 2010)

Log Message:
---
SimpleSearch - enabling text input updating to match suggestions while 
preventing the special results section from updating

Modified Paths:
--
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js

Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 15:19:27 UTC (rev 68218)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php  
2010-06-18 15:59:18 UTC (rev 68219)
@@ -64,7 +64,7 @@
array( 'src' => 'js/plugins/jquery.cookie.js', 
'version' => 4 ),
array( 'src' => 
'js/plugins/jquery.delayedBind.js', 'version' => 1 ),
array( 'src' => 
'js/plugins/jquery.expandableField.js', 'version' => 17 ),
-   array( 'src' => 
'js/plugins/jquery.suggestions.js', 'version' => 27 ),
+   array( 'src' => 
'js/plugins/jquery.suggestions.js', 'version' => 28 ),
array( 'src' => 
'js/plugins/jquery.textSelection.js', 'version' => 36 ),
array( 'src' => 
'js/plugins/jquery.wikiEditor.js', 'version' => 195 ),
array( 'src' => 
'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ),
@@ -80,10 +80,10 @@
array( 'src' => 
'js/thirdparty/contentCollector.js', 'version' => 2 ),
),
'combined' => array(
-   array( 'src' => 'js/plugins.combined.js', 
'version' => 435 ),
+   array( 'src' => 'js/plugins.combined.js', 
'version' => 436 ),
),
'minified' => array(
-   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 437 ),
+   array( 'src' => 'js/plugins.combined.min.js', 
'version' => 438 ),
),
),
);

Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
===
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js   
2010-06-18 15:19:27 UTC (rev 68218)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js   
2010-06-18 15:59:18 UTC (rev 68219)
@@ -255,7 +255,7 @@
result.addClass( 'suggestions-result-current' );
}
if ( updateTextbox ) {
-   if ( result.length == 0 ) {
+   if ( result.length == 0 || result.is( 
'.suggestions-special' ) ) {
$.suggestions.restore( context );
} else {
context.data.$textbox.val( result.data( 'text' 
) );
@@ -265,7 +265,6 @@
}
context.data.$textbox.trigger( 'change' );
}
-   $.suggestions.special( context );
},
/**
 * Respond to keypress event
@@ -278,7 +277,7 @@
// Arrow down
case 40:
if ( wasVisible ) {
-   $.suggestions.highlight( context, 
'next', false );
+   $.suggestions.highlight( context, 
'next', true );
} else {
$.suggestions.update( context, false );
}
@@ -287,7 +286,7 @@
// Arrow up
case 38:
if ( wasVisible ) {
-   $.suggestions.highlight( context, 
'prev', false );
+   $.suggestions.highlight( context, 
'prev', true );
}
preventDefault = wasVisible;
break;

Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
===
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-06-18 
15:19:27 UTC (rev 68218)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-06-18 
15:59:18 UTC (rev 68219)
@@ -1224,7 +1224,7 @@
result.addClass( 'suggestions-

[MediaWiki-CVS] SVN: [68218] trunk/webstatscollector

2010-06-18 Thread midom

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

Revision: 68218
Author:   midom
Date: 2010-06-18 15:19:27 + (Fri, 18 Jun 2010)

Log Message:
---
fix some segfaults (added by r67338) and jailing sequence (initial code, 
touched by r67367), add apparmor profile 

Modified Paths:
--
trunk/webstatscollector/filter.c

Added Paths:
---
trunk/webstatscollector/aa-filter

Added: trunk/webstatscollector/aa-filter
===
--- trunk/webstatscollector/aa-filter   (rev 0)
+++ trunk/webstatscollector/aa-filter   2010-06-18 15:19:27 UTC (rev 68218)
@@ -0,0 +1,9 @@
+#include 
+/a/webstats/bin/filter {
+  #include 
+  capability setuid,
+  capability setgid,
+  capability sys_chroot,
+  /a/webstats/bin/filter mixr,
+}
+

Modified: trunk/webstatscollector/filter.c
===
--- trunk/webstatscollector/filter.c2010-06-18 11:52:24 UTC (rev 68217)
+++ trunk/webstatscollector/filter.c2010-06-18 15:19:27 UTC (rev 68218)
@@ -151,10 +151,13 @@
 
 int main(int ac, char **av) {
char line[LINESIZE];
+   int gidlist[] = {65534};
 
+   chroot("/tmp/");
+   chdir("/");
+   setgid(65534);
+   setgroups(1,gidlist);
setuid(65534);
-   setgid(65534);
-   chroot("/tmp");
 
char *undef,*ip,*url, *size;
while(fgets(line,LINESIZE-1,stdin)) {



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

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

2010-06-18 Thread reedy

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

Revision: 68217
Author:   reedy
Date: 2010-06-18 11:52:24 + (Fri, 18 Jun 2010)

Log Message:
---
RELEASE-NOTES for r68211

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

Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES  2010-06-18 11:18:19 UTC (rev 68216)
+++ trunk/phase3/RELEASE-NOTES  2010-06-18 11:52:24 UTC (rev 68217)
@@ -225,6 +225,8 @@
 * (bug 23835) Need "thumbmime" result in "imageinfo" query
 * (bug 23851) Repair diff for file redirect pages
 * (bug 24009) Include implicit groups in action=query&list=users&usprop=groups
+* (bug 24016) API: Handle parameters specified in simple string syntax 
+  ( 'paramname' => 'defaultval' ) correctly when outputting help
 
 === Languages updated in 1.17 ===
 



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

[MediaWiki-CVS] SVN: [68216] trunk/extensions/DataTransclusion/OpenLibrarySource.php

2010-06-18 Thread daniel

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

Revision: 68216
Author:   daniel
Date: 2010-06-18 11:18:19 + (Fri, 18 Jun 2010)

Log Message:
---
some todo notes

Modified Paths:
--
trunk/extensions/DataTransclusion/OpenLibrarySource.php

Modified: trunk/extensions/DataTransclusion/OpenLibrarySource.php
===
--- trunk/extensions/DataTransclusion/OpenLibrarySource.php 2010-06-18 
11:03:36 UTC (rev 68215)
+++ trunk/extensions/DataTransclusion/OpenLibrarySource.php 2010-06-18 
11:18:19 UTC (rev 68216)
@@ -37,6 +37,7 @@
function __construct( $spec ) {
if ( !isset( $spec['url'] ) ) {
$spec['url'] = 
'http://openlibrary.org/api/books?bibkeys=ISBN:{isbn}&details=true';
+   //TODO: custom function to normalize ISBN (trim, strip 
dashes, correct checksum, etc)
}
 
if ( !isset( $spec['dataFormat'] ) ) {



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

[MediaWiki-CVS] SVN: [68215] trunk/extensions/AssertEdit/AssertEdit.php

2010-06-18 Thread reedy

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

Revision: 68215
Author:   reedy
Date: 2010-06-18 11:03:36 + (Fri, 18 Jun 2010)

Log Message:
---
Remove == comparison to true from AssertEdit...

Add a couple of braces

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

Modified: trunk/extensions/AssertEdit/AssertEdit.php
===
--- trunk/extensions/AssertEdit/AssertEdit.php  2010-06-18 11:01:02 UTC (rev 
68214)
+++ trunk/extensions/AssertEdit/AssertEdit.php  2010-06-18 11:03:36 UTC (rev 
68215)
@@ -77,8 +77,9 @@
 
if ( $assertName != '' ) {
$pass = AssertEdit::callAssert( $assertName, false );
-   if ( !$pass )
+   if ( !$pass ) {
$result['assert'] = $assertName;
+   }
}
 
// check for negative assert
@@ -87,9 +88,10 @@
if ( $assertName != '' ) {
$pass = AssertEdit::callAssert( $assertName, true );
}
-   if ( !$pass )
+   if ( !$pass ) {
$result['nassert'] = $assertName;
+   }
}

-   return $pass == true;
+   return $pass;
 }



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

[MediaWiki-CVS] SVN: [68214] trunk/extensions/AssertEdit

2010-06-18 Thread reedy

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

Revision: 68214
Author:   reedy
Date: 2010-06-18 11:01:02 + (Fri, 18 Jun 2010)

Log Message:
---
Revert r62840

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

Removed Paths:
-
trunk/extensions/AssertEdit/ApiAssertEdit.php

Deleted: trunk/extensions/AssertEdit/ApiAssertEdit.php
===
--- trunk/extensions/AssertEdit/ApiAssertEdit.php   2010-06-18 11:00:06 UTC 
(rev 68213)
+++ trunk/extensions/AssertEdit/ApiAssertEdit.php   2010-06-18 11:01:02 UTC 
(rev 68214)
@@ -1,58 +0,0 @@
-dieUsage( '', 'assertedit' );
-   }
-
-   public function getDescription() {
-   return 'Allows bots to make assertions. Can only be used during 
of editing';
-   }
-
-   public function isReadMode() {
-   return false;
-   }
-
-   public function shouldCheckMaxlag() {
-   return false;
-   }
-
-   public function getParamDescription() {
-   return array(
-   'user' => 'Verify that bot is logged in, to prevent 
anonymous edits.',
-   'bot' => 'Verify that bot is logged in and has a bot 
flag.',
-   'true' => 'Always true; nassert=true will fail if the 
extension is installed.',
-   'false' => 'Always false; assert=false will fail if the 
extension is installed.',
-   'exists' => 'Verify that page exists. Could be useful 
from other extensions, i.e. adding nassert=exists to the inputbox extension.',
-   'test' => 'Verify that this wiki allows random testing. 
Defaults to false, but can be overridden in LocalSettings.php.'
-   );
-   }
-
-   public function getPossibleErrors() {
-   return array();
-   }
-
-   public function getAllowedParams() {
-   return array(
-   'user' => null,
-   'bot' => null,
-   'true' => null,
-   'false' => null,
-   'exists' => null,
-   'test' => null
-   );
-   }
-
-   public function getVersion() {
-   return __CLASS__ . ': $Id$';
-   }
-}

Modified: trunk/extensions/AssertEdit/AssertEdit.php
===
--- trunk/extensions/AssertEdit/AssertEdit.php  2010-06-18 11:00:06 UTC (rev 
68213)
+++ trunk/extensions/AssertEdit/AssertEdit.php  2010-06-18 11:01:02 UTC (rev 
68214)
@@ -30,9 +30,6 @@
 $wgHooks['AlternateEdit'][] = 'efAssertEditHook';
 $wgHooks['APIEditBeforeSave'][] = 'efAssertApiEditHook';
 
-$wgAutoloadClasses['ApiAssertEdit'] = $dir . "ApiAssertEdit.php";
-$wgAPIModules['assertedit'] = 'ApiAssertEdit';
-
 function efAssertEditHook( $editpage ) {
global $wgOut, $wgRequest;
 



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

[MediaWiki-CVS] SVN: [68213] trunk/extensions/DataTransclusion/OpenLibrarySource.php

2010-06-18 Thread daniel

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

Revision: 68213
Author:   daniel
Date: 2010-06-18 11:00:06 + (Fri, 18 Jun 2010)

Log Message:
---
parse more fields from the OpenLibrary

Modified Paths:
--
trunk/extensions/DataTransclusion/OpenLibrarySource.php

Modified: trunk/extensions/DataTransclusion/OpenLibrarySource.php
===
--- trunk/extensions/DataTransclusion/OpenLibrarySource.php 2010-06-18 
10:16:23 UTC (rev 68212)
+++ trunk/extensions/DataTransclusion/OpenLibrarySource.php 2010-06-18 
11:00:06 UTC (rev 68213)
@@ -52,7 +52,25 @@
}
 
if ( !isset( $spec['fieldNames'] ) ) {
-   $spec['fieldNames'] = 'author,date,publisher,title,url';
+   $spec['fieldNames'] = array(
+   'author',
+   'date',
+   'publisher',
+   'title',
+   'url',
+   'city',
+   'edition',
+   'ISBN10',
+   'ISBN13',
+   'LCC',
+   'LCCN',
+   'DDC',
+   'pages',
+   'series',
+   'subtitle',
+   'language',
+   'editor',
+   );
}
 
if ( !isset( $spec['sourceInfo'] ) ) {
@@ -76,8 +94,9 @@
 
public function flattenRecord( $rec ) {
$r = array();
-   $r['date'] = $rec['details']['publish_date'];
-   
+
+   $r['date'] = @$rec['details']['publish_date']; //TODO: split 
into year/month/day
+
$r['title'] = $rec['details']['title'];
if ( @$rec['details']['title_prefix'] ) {
$r['title'] = trim( $rec['details']['title_prefix'] ) 
@@ -86,18 +105,89 @@
 
$r['url'] = $rec['info_url'];
 
+   $r['pages'] = @$rec['details']['number_of_pages'];
+   $r['edition'] = @$rec['details']['edition_name'];
+
$r['publisher'] = "";
-   foreach ( $rec['details']['publishers'] as $publisher ) {
-   if ( $r['publisher'] != "" ) $r['publisher'] .= '; ';
-   $r['publisher'] .= $publisher;
+   if ( isset( $rec['details']['publishers'] ) ) {
+   foreach ( $rec['details']['publishers'] as $publisher ) 
{
+   if ( $r['publisher'] != "" ) $r['publisher'] .= 
'; ';
+   $r['publisher'] .= $publisher;
+   }
}
 
$r['author'] = "";
-   foreach ( $rec['details']['authors'] as $author ) {
-   if ( $r['author'] != "" ) $r['author'] .= ', ';
-   $r['author'] .= $author['name'];
+   if ( isset( $rec['details']['authors'] ) ) {
+   foreach ( $rec['details']['authors'] as $author ) {
+   if ( $r['author'] != "" ) $r['author'] .= ', ';
+
+   if ( $author['key'] != "/authors/OL2693863A" ) 
{ //"Journal" is not a real author.
+   $r['author'] .= $author['name'];
+   }
+   }
}
+
+   $r['editor'] = "";
+   if ( isset( $rec['details']['editors'] ) ) {
+   foreach ( $rec['details']['editors'] as $editor ) {
+   if ( $r['editor'] != "" ) $r['editor'] .= ', ';
+   $r['editor'] .= $editor;
+   }
+   }
+
+   if ( empty( $r['author'] ) && empty( $r['editor'] ) ) {
+   if ( isset( $rec['details']['by_statement'] ) ) {
+   $r['author'] = $rec['details']['by_statement']; 
//XXX ugly...
+   }
+   }
+
+   $r['city'] = "";
+   if ( isset( $rec['details']['publish_places'] ) ) {
+   foreach ( $rec['details']['publish_places'] as $place ) 
{
+   if ( $r['city'] != "" ) $r['city'] .= '/';
+   $r['city'] .= $place;
+   }
+   }
+
+   $r['LCC'] = "";
+   if ( isset( $rec['details']['lc_classifications'] ) ) {
+   foreach ( $rec['details']['lc_classifications'] as 
$place ) {
+   if ( $r['LCC'] != "" ) $r['LCC'] .= ' / ';
+   $r['LCC'] .= $place;
+

[MediaWiki-CVS] SVN: [68212] trunk/extensions/DataTransclusion

2010-06-18 Thread daniel

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

Revision: 68212
Author:   daniel
Date: 2010-06-18 10:16:23 + (Fri, 18 Jun 2010)

Log Message:
---
' doesn't work, use ' instead

Modified Paths:
--
trunk/extensions/DataTransclusion/DataTransclusionHandler.php
trunk/extensions/DataTransclusion/tests/DataTransclusionTest.php

Modified: trunk/extensions/DataTransclusion/DataTransclusionHandler.php
===
--- trunk/extensions/DataTransclusion/DataTransclusionHandler.php   
2010-06-18 09:30:38 UTC (rev 68211)
+++ trunk/extensions/DataTransclusion/DataTransclusionHandler.php   
2010-06-18 10:16:23 UTC (rev 68212)
@@ -296,7 +296,7 @@
'!\]!' => ']',
'!\{!' => '{',
'!\}!' => '}',
-   '!\'!' => ''',
+   '!\'!' => ''', //NOTE: ' doesn't work, mediawiki 
escapes it. maybe because it'S not in HTML 4.
'!\|!' => '|',
'!^\*!m' => '*',
'!^#!m' => '#',

Modified: trunk/extensions/DataTransclusion/tests/DataTransclusionTest.php
===
--- trunk/extensions/DataTransclusion/tests/DataTransclusionTest.php
2010-06-18 09:30:38 UTC (rev 68211)
+++ trunk/extensions/DataTransclusion/tests/DataTransclusionTest.php
2010-06-18 10:16:23 UTC (rev 68212)
@@ -93,7 +93,7 @@
$this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo ' ), 'foo ' );
$this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo [[bar]]' ), 'foo [[bar]]' );
$this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo {{bar}}' ), 'foo {{bar}}' );
-   $this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo \'bar\'' ), 'foo 'bar'' );
+   $this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo \'bar\'' ), 'foo 'bar'' );
$this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo|bar' ), 'foo|bar' );
$this->assertEquals( DataTransclusionHandler::sanitizeValue( '* 
foo bar' ), '* foo bar' );
$this->assertEquals( DataTransclusionHandler::sanitizeValue( 
'foo*bar' ), 'foo*bar' );
@@ -237,7 +237,7 @@
function testHandleRecordFunction() {
global $wgDataTransclusionSources;
 
-   $data[] = array( "name" => "foo", "id" => "3", "info" => 
'&[[X]]', "url" => 'http://test.org/', "evil" => 
'javascript:alert("evil")' );
+   $data[] = array( "name" => "foo", "id" => "3", "info" => 
'&[[X]]\'', "url" => 'http://test.org/', "evil" => 
'javascript:alert("evil")' );
$spec = array(
'class' => 'FakeDataTransclusionSource',
'data' => $data,
@@ -257,7 +257,7 @@
$wgParser->parse( $text, $title, $options );
 
$html = $wgParser->getOutput()->getText();   
-   $this->assertEquals( $html, 'xx 
FOO:3|foo|Hallo|&[[X]]|http://test.org/"; class="external text" 
rel="nofollow">link|[javascript:alert("evil") click me] xx'."\n".'' ); 
// XXX: should be more lenient wrt whitespace
+   $this->assertEquals( $html, 'xx 
FOO:3|foo|Hallo|&[[X]]'|http://test.org/"; class="external text" 
rel="nofollow">link|[javascript:alert("evil") click me] xx'."\n".'' ); 
// XXX: should be more lenient wrt whitespace
$templates = $wgParser->getOutput()->getTemplates();
$this->assertTrue( isset( $templates[ NS_TEMPLATE ]['Test'] ) 
); 
}
@@ -265,7 +265,7 @@
function testHandleRecordTag() {
global $wgDataTransclusionSources;
 
-   $data[] = array( "name" => "foo", "id" => "3", "info" => 
'&[[X]]', "url" => 'http://test.org/', "evil" => 
'javascript:alert("evil")' );
+   $data[] = array( "name" => "foo", "id" => "3", "info" => 
'&[[X]]\'', "url" => 'http://test.org/', "evil" => 
'javascript:alert("evil")' );
$spec = array(
'class' => 'FakeDataTransclusionSource',
'data' => $data,
@@ -285,7 +285,7 @@
$wgParser->parse( $text, $title, $options );
 
$html = $wgParser->getOutput()->getText();  
-   $this->assertEquals( $html, 'xx 
FOO:3|foo|Hallo|&[[X]]|http://test.org/"; class="external text" 
rel="nofollow">link|[javascript:alert("evil") click me] xx'."\n".'' ); 
// XXX: should be more lenient wrt whitespace
+   $this->assertEquals( $html, 'xx 
FOO:3|foo|Hallo|&[[X]]'|http://test.org/"; class="external text" 
rel="nofollow">link|[javascript:alert("evil") click me] xx'."\n".'' ); 
// XXX: should be more lenient wrt whitespace
$templates = $wgParser->getOutput()->getTemplates();
$this->assertTrue( isset( $templates[ NS_TEMPLATE ]['

[MediaWiki-CVS] SVN: [68211] trunk/phase3/includes/api/ApiBase.php

2010-06-18 Thread catrope

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

Revision: 68211
Author:   catrope
Date: 2010-06-18 09:30:38 + (Fri, 18 Jun 2010)

Log Message:
---
(bug 24016) API: Handle parameters specified in simple string syntax ( 
'paramname' => 'defaultval' ) correctly when outputting help. Patch by Brad 
Jorsch.

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

Modified: trunk/phase3/includes/api/ApiBase.php
===
--- trunk/phase3/includes/api/ApiBase.php   2010-06-18 08:57:55 UTC (rev 
68210)
+++ trunk/phase3/includes/api/ApiBase.php   2010-06-18 09:30:38 UTC (rev 
68211)
@@ -294,6 +294,12 @@
$desc = implode( $paramPrefix, $desc );
}
 
+   if ( !is_array( $paramSettings ) ) {
+   $paramSettings = array(
+   self::PARAM_DFLT => 
$paramSettings,
+   );
+   }
+
$deprecated = isset( 
$paramSettings[self::PARAM_DEPRECATED] ) ?
$paramSettings[self::PARAM_DEPRECATED] 
: false;
if ( $deprecated ) {



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

[MediaWiki-CVS] SVN: [68210] trunk/extensions/FlaggedRevs/FlaggedRevsXML.php

2010-06-18 Thread aaron

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

Revision: 68210
Author:   aaron
Date: 2010-06-18 08:57:55 + (Fri, 18 Jun 2010)

Log Message:
---
Fixed stray quote in HTML

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedRevsXML.php

Modified: trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-06-18 08:47:19 UTC 
(rev 68209)
+++ trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2010-06-18 08:57:55 UTC 
(rev 68210)
@@ -345,7 +345,7 @@
 * @returns string
 */
public static function diffToggle() {
-   $toggle = '' .
wfMsgHtml( 'revreview-diff-toggle-show' ) . '';



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

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

2010-06-18 Thread aaron

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

Revision: 68209
Author:   aaron
Date: 2010-06-18 08:47:19 + (Fri, 18 Jun 2010)

Log Message:
---
* Made draft view diffs collapsable
* Improved maybeShowTopDiff() performance with short circuit
* Refactored code duplication into getFormattedDiff()

Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedArticleView.php
trunk/extensions/FlaggedRevs/client/flaggedrevs.css

Modified: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
===
--- trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-06-18 04:59:37 UTC 
(rev 68208)
+++ trunk/extensions/FlaggedRevs/FlaggedArticleView.php 2010-06-18 08:47:19 UTC 
(rev 68209)
@@ -655,6 +655,10 @@
if ( $oldid && $oldid != $latest ) {
return false; // not viewing the draft
}
+   $revsSince = $this->article->getPendingRevCount();
+   if ( !$revsSince ) {
+   return false; // no pending changes
+   }
# Conditions are met to show diff...
# Left side of diff...
$leftNote = $quality
@@ -679,35 +683,51 @@
if ( strcmp( $oText, $nText ) !== 0 ) {
$diffEngine = new DifferenceEngine( 
$this->article->getTitle() );
$diffEngine->showDiffStyle();
-   $n = $this->article->getTitle()->countRevisionsBetween( 
$srev->getRevId(), $latest );
-   if ( $n ) {
-   $multiNotice = "" .
-   wfMsgExt( 'diff-multi', array( 'parse' 
), $n ) . "";
-   } else {
-   $multiNotice = '';
+   $diffBody = $diffEngine->generateDiffBody( $oText, 
$nText );
+   $n = $revsSince--; // this is the full diff-to-stable
+   $items = array();
+   $diffHtml =
+   FlaggedRevsXML::pendingEditNotice( 
$this->article, $srev, $revsSince ) .
+   ' ' . FlaggedRevsXML::diffToggle() .
+   "" .
+   self::getFormattedDiff( $diffBody, $n, 
$leftNote, $rightNote ) .
+   "\n";
+   $items[] = $diffHtml;
+   $html = "";
+   foreach ( $items as $item ) {
+   $html .= '' . $item . '';
}
-   $wgOut->addHTML(
-   "" .
-   "" .
+   $html .= '';
+   $wgOut->addHtml( $html );
+   $this->isDiffFromStable = true; // alter default review 
form tags
+   return true;
+   }
+   return false;
+   }
+
+   // $n number of in-between revs
+   protected static function getFormattedDiff( $diffBody, $n, $leftStatus, 
$rightStatus ) {
+   if ( $n ) {
+   $multiNotice = "" .
+   wfMsgExt( 'diff-multi', array( 'parse' ), $n ) 
. "";
+   } else {
+   $multiNotice = '';
+   }
+   return
+   "" .
"" .
"" .
"" .
"" .
"" .
"" .
-   $leftNote . "" .
+   $leftStatus . "" .
"" .
-   $rightNote . "" .
+   $rightStatus . "" .
"" .
$multiNotice .
-   $diffEngine->generateDiffBody( $oText, $nText ) 
.
-   "" .
-   "\n"
-   );
-   $this->isDiffFromStable = true;
-   return true;
-   }
-   return false;
+   $diffBody .
+   "";
}
 
/**
@@ -858,23 +878,12 @@
if ( $text !== false && strcmp( $text, 
$editPage->textbox1 ) !== 0 ) {
$diffEngine = new DifferenceEngine( 
$this->article->getTitle() );
$diffEngine->showDiffStyle();
+   $diffBody = 
$diffEngine->generateDiffBody( $text, $editPage->textbox1 );
$diffHtml =

50 matches

Mail list logo