[MediaWiki-CVS] SVN: [70449] trunk/phase3/includes/installer/Installer.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70449 Revision: 70449 Author: nikerabbit Date: 2010-08-04 04:56:12 + (Wed, 04 Aug 2010) Log Message: --- X installed -> X is installed Trying to make it more clear that we only detected the state and not that we installed X now. Modified Paths: -- trunk/phase3/includes/installer/Installer.i18n.php Modified: trunk/phase3/includes/installer/Installer.i18n.php === --- trunk/phase3/includes/installer/Installer.i18n.php 2010-08-04 04:30:12 UTC (rev 70448) +++ trunk/phase3/includes/installer/Installer.i18n.php 2010-08-04 04:56:12 UTC (rev 70449) @@ -74,7 +74,7 @@ You can install MediaWiki.', // FIXME: take span out of message. 'config-env-bad' => 'The environment has been checked. You cannot install MediaWiki.', - 'config-env-php' => 'PHP $1 installed.', + 'config-env-php' => 'PHP $1 is installed.', 'config-env-latest-ok'=> 'You are installing the latest version of Mediawiki.', 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki.", 'config-env-latest-can-not-check' => "'''Note:''' The installer was unable to retrieve information about the latest MediaWiki release from [$1].", @@ -127,10 +127,10 @@ 'config-memory-bad' => "'''Warning:''' PHP's memory_limit is $1. This is probably too low. The installation may fail!", - 'config-xcache' => '[http://trac.lighttpd.net/xcache/ XCache] installed', - 'config-apc' => '[http://www.php.net/apc APC] installed', - 'config-eaccel' => '[http://eaccelerator.sourceforge.net/ eAccelerator] installed', - 'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] installed', + 'config-xcache' => '[http://trac.lighttpd.net/xcache/ XCache] is installed', + 'config-apc' => '[http://www.php.net/apc APC] is installed', + 'config-eaccel' => '[http://eaccelerator.sourceforge.net/ eAccelerator] is installed', + 'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] is installed', 'config-no-cache' => "'''Warning:''' Could not find [http://eaccelerator.sourceforge.net eAccelerator], [http://www.php.net/apc APC], [http://trac.lighttpd.net/xcache/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache]. Object caching is not enabled.", 'config-diff3-good' => 'Found GNU diff3: $1.', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70448] trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70448
Revision: 70448
Author: mah
Date: 2010-08-04 04:30:12 + (Wed, 04 Aug 2010)
Log Message:
---
provide a simpler, faster fix for the problem that r70106 was trying to solve.
Modified Paths:
--
trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
Modified: trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
===
--- trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-08-04 01:58:59 UTC (rev 70447)
+++ trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
2010-08-04 04:30:12 UTC (rev 70448)
@@ -85,13 +85,6 @@
function showOnce() {
NewMessages::recacheMessageCount( $this->user->getId() );
- static $scriptDone = false;
-
- if ( !$scriptDone ) {
- global $wgOut, $wgLiquidThreadsExtensionPath;
- $wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/newmessages.js" );
- }
-
$this->user->setNewtalk( false );
if ( $this->methodApplies( 'mark_as_unread' ) ) {
@@ -208,7 +201,12 @@
$mustShowThreads = $this->targets[$t->id()];
$this->showThread( $t, 1, 1, array( 'mustShowThreads' =>
$mustShowThreads ) );
-
+ static $scriptDone = false;
+ if ( !$scriptDone ) {
+ global $wgLiquidThreadsExtensionPath;
+ $this->output->addScriptFile(
"$wgLiquidThreadsExtensionPath/newmessages.js" );
+ $scriptDone = true;
+ }
$this->output->addHTML( "" );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70447] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70447
Revision: 70447
Author: kaldari
Date: 2010-08-04 01:58:59 + (Wed, 04 Aug 2010)
Log Message:
---
HTML/CSS clean-up in CetralNotice
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
trunk/extensions/CentralNotice/centralnotice.css
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
01:25:54 UTC (rev 70446)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
01:58:59 UTC (rev 70447)
@@ -152,9 +152,9 @@
);
}
$htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-manage-templates' ) );
- $htmlOut .= $pager->getNavigationBar() .
- $pager->getBody() .
- $pager->getNavigationBar();
+ $htmlOut .= Xml::tags( 'div', array( 'class' =>
'cn-pager' ), $pager->getNavigationBar() );
+ $htmlOut .= $pager->getBody();
+ $htmlOut .= Xml::tags( 'div', array( 'class' =>
'cn-pager' ), $pager->getNavigationBar() );
if ( $this->editable ) {
$htmlOut .= Xml::closeElement( 'form' );
@@ -333,17 +333,17 @@
);
$htmlOut .= Xml::closeElement( 'tr' );
}
+ $htmlOut .= Xml::closeElement( 'table' );
+
if ( $this->editable ) {
$htmlOut .= Xml::hidden( 'wpUserLanguage',
$wpUserLang );
- $htmlOut .= Xml::openElement( 'tr' );
- $htmlOut .= Xml::tags( 'td', array( 'colspan'
=> 4 ),
- Xml::submitButton( wfMsg(
'centralnotice-modify' ), array( 'name' => 'update' ) )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ), array( 'name' => 'update' ) )
);
- $htmlOut .= Xml::closeElement( 'tr' );
}
-
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+
$htmlOut .= Xml::closeElement( 'fieldset' );
if ( $this->editable ) {
@@ -395,13 +395,14 @@
$htmlOut .= Xml::tags( 'tr', null,
Xml::tags( 'td', null, Xml::textarea( 'templateBody',
$body, 60, 20, $readonly ) )
);
+ $htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::tags( 'tr', null,
- Xml::tags( 'td', null, Xml::submitButton(
wfMsg( 'centralnotice-modify' ) ) )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
);
}
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
$htmlOut .= Xml::closeElement( 'fieldset' );
if ( $this->editable ) {
$htmlOut .= Xml::closeElement( 'form' );
@@ -767,15 +768,14 @@
function getEndBody() {
global $wgUser;
$htmlOut = '';
+ $htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::tags( 'tr', null,
- Xml::tags( 'td', array( 'colspan' => 3 ),
- Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
- )
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
+ array( 'class' => 'cn-buttons' ),
+ Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
);
}
- $htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken', $
[MediaWiki-CVS] SVN: [70446] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70446
Revision: 70446
Author: kaldari
Date: 2010-08-04 01:25:54 + (Wed, 04 Aug 2010)
Log Message:
---
Fixing getTitle calls per comment in r70440
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialCentralNotice.php
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-04
00:53:14 UTC (rev 70445)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-04
01:25:54 UTC (rev 70446)
@@ -419,7 +419,7 @@
$htmlOut .= Xml::openElement( 'form',
array(
'method' => 'post',
- 'action' =>
SpecialPage::getTitleFor( 'CentralNotice' )->getFullUrl()
+ 'action' =>
$this->getTitle()->getFullUrl()
)
);
}
@@ -548,7 +548,7 @@
$htmlOut .= Xml::openElement( 'form',
array(
'method' => 'post',
- 'action' => SpecialPage::getTitleFor(
'CentralNotice' )->getLocalUrl()
+ 'action' =>
$this->getTitle()->getLocalUrl()
)
);
$htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-add-notice' ) );
@@ -634,7 +634,7 @@
$this->addTemplateTo( $notice,
$template, $weight[$template] );
}
}
- $wgOut->redirect( SpecialPage::getTitleFor(
'CentralNotice' )->getLocalUrl( "method=listNoticeDetail¬ice=$notice" ) );
+ $wgOut->redirect( $this->getTitle()->getLocalUrl(
"method=listNoticeDetail¬ice=$notice" ) );
return;
}
@@ -647,7 +647,7 @@
$htmlOut .= Xml::openElement( 'form',
array(
'method' => 'post',
- 'action' => SpecialPage::getTitleFor(
'CentralNotice' )->getLocalUrl( "method=listNoticeDetail¬ice=$notice" )
+ 'action' =>
$this->getTitle()->getLocalUrl( "method=listNoticeDetail¬ice=$notice" )
)
);
}
@@ -671,7 +671,7 @@
if ( $output_assigned == '' && $output_templates == ''
) {
$htmlOut .= wfMsg( 'centralnotice-no-templates'
);
$htmlOut .= Xml::element( 'p' );
- $newPage = SpecialPage::getTitleFor(
'NoticeTemplate', 'add' );
+ $newPage = $this->getTitleFor(
'NoticeTemplate', 'add' );
$sk = $wgUser->getSkin();
$htmlOut .= $sk->makeLinkObj( $newPage,
wfMsgHtml( 'centralnotice-add-template' ) );
$htmlOut .= Xml::element( 'p' );
@@ -863,7 +863,7 @@
$this->weightDropDown(
"weight[$row->tmp_name]", $row->tmp_weight )
);
- $viewPage = SpecialPage::getTitleFor(
'NoticeTemplate/view' );
+ $viewPage = $this->getTitleFor( 'NoticeTemplate',
'view' );
$render = new SpecialNoticeText();
$render->project = 'wikipedia';
global $wgRequest;
@@ -961,7 +961,7 @@
);
// Render preview
- $viewPage = SpecialPage::getTitleFor(
'NoticeTemplate/view' );
+ $viewPage = $this->getTitleFor(
'NoticeTemplate', 'view' );
$render = new SpecialNoticeText();
$render->project = 'wikipedia';
global $wgRequest;
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:53:14 UTC (rev 70445)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
01:25:54 UTC (rev 70446)
@@ -113,7 +113,7 @@
$newTemplate = $wgRequest->getVal(
'newTemplate' );
// We use the ret
[MediaWiki-CVS] SVN: [70445] trunk/tools/planet/en/config.ini
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70445 Revision: 70445 Author: hartman Date: 2010-08-04 00:53:14 + (Wed, 04 Aug 2010) Log Message: --- Switch Sue's wordpress blog to an atom feed per Bug 22937. Modified Paths: -- trunk/tools/planet/en/config.ini Modified: trunk/tools/planet/en/config.ini === --- trunk/tools/planet/en/config.ini2010-08-04 00:29:20 UTC (rev 70444) +++ trunk/tools/planet/en/config.ini2010-08-04 00:53:14 UTC (rev 70445) @@ -429,5 +429,5 @@ [http://saml.rilspace.org/taxonomy/term/69/0/feed] name=Samuel Lampa -[http://suegardner.org/feed/] +[http://suegardner.org/feed/atom] name=Sue Gardner ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70444] trunk/phase3/maintenance/updateCollation.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70444 Revision: 70444 Author: simetrical Date: 2010-08-04 00:29:20 + (Wed, 04 Aug 2010) Log Message: --- Preserve cl_timestamp in updateCollation.php For those crazy Wikinews people, and other DPL users. Why do we use a crazy auto-updating column type instead of specifying the current time explicitly when we want to update it, again . . . ? Modified Paths: -- trunk/phase3/maintenance/updateCollation.php Modified: trunk/phase3/maintenance/updateCollation.php === --- trunk/phase3/maintenance/updateCollation.php2010-08-04 00:29:03 UTC (rev 70443) +++ trunk/phase3/maintenance/updateCollation.php2010-08-04 00:29:20 UTC (rev 70444) @@ -91,6 +91,7 @@ 'cl_sortkey_prefix' => $prefix, 'cl_collation' => $wgCollationVersion, 'cl_type' => $type, + 'cl_timestamp = cl_timestamp', ), array( 'cl_from' => $row->cl_from, 'cl_to' => $row->cl_to ), __METHOD__ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70443] trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70443
Revision: 70443
Author: kaldari
Date: 2010-08-04 00:29:03 + (Wed, 04 Aug 2010)
Log Message:
---
Fixing unclosed divs in CentralNotice
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:26:12 UTC (rev 70442)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:29:03 UTC (rev 70443)
@@ -88,12 +88,14 @@
if ( $sub == 'view' && $wgRequest->getVal( 'wpUserLanguage' )
== 'all' ) {
$template = $wgRequest->getVal( 'template' );
$this->showViewAvailable( $template );
+ $wgOut->addHTML( Xml::closeElement( 'div' ) );
return;
}
// Handle viewing a specific template
if ( $sub == 'view' && $wgRequest->getText( 'template' ) != ''
) {
$this->showView();
+ $wgOut->addHTML( Xml::closeElement( 'div' ) );
return;
}
@@ -101,6 +103,7 @@
// Handle "Add a banner" link
if ( $sub == 'add' ) {
$this->showAdd();
+ $wgOut->addHTML( Xml::closeElement( 'div' ) );
return;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70442] trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70442
Revision: 70442
Author: kaldari
Date: 2010-08-04 00:26:12 + (Wed, 04 Aug 2010)
Log Message:
---
Better fix for r70440. Actually it looks like the old token stuff was left over
from previous auth scheme
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:11:45 UTC (rev 70441)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:26:12 UTC (rev 70442)
@@ -54,13 +54,12 @@
// Handle translation message update
$update = $wgRequest->getArray( 'updateText' );
- $token = $wgRequest->getArray( 'token' );
if ( isset ( $update ) ) {
foreach ( $update as $lang => $messages
) {
foreach ( $messages as $text =>
$translation ) {
// If we actually have
text
if ( $translation ) {
-
$this->updateMessage( $text, $translation, $lang, $token );
+
$this->updateMessage( $text, $translation, $lang );
}
}
}
@@ -216,9 +215,6 @@
$readonly = array( 'readonly' => 'readonly' );
}
- // Get token
- $token = $wgUser->editToken();
-
// Get user's language
$wpUserLang = $wgRequest->getVal( 'wpUserLanguage' ) ?
$wgRequest->getVal( 'wpUserLanguage' ) : $wgContLanguageCode;
@@ -335,7 +331,6 @@
$htmlOut .= Xml::closeElement( 'tr' );
}
if ( $this->editable ) {
- $htmlOut .= Xml::hidden( 'token', $token );
$htmlOut .= Xml::hidden( 'wpUserLanguage',
$wpUserLang );
$htmlOut .= Xml::openElement( 'tr' );
$htmlOut .= Xml::tags( 'td', array( 'colspan'
=> 4 ),
@@ -481,7 +476,7 @@
return $wgOut->addHtml( $htmlOut );
}
- private function updateMessage( $text, $translation, $lang, $token =
false ) {
+ private function updateMessage( $text, $translation, $lang ) {
$title = Title::newFromText(
( $lang == 'en' ) ? "Centralnotice-{$text}" :
"Centralnotice-{$text}/{$lang}",
NS_MEDIAWIKI
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70440] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70440
Revision: 70440
Author: kaldari
Date: 2010-08-04 00:05:48 + (Wed, 04 Aug 2010)
Log Message:
---
Fix for form issues
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialCentralNotice.php
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-03
23:37:45 UTC (rev 70439)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-04
00:05:48 UTC (rev 70440)
@@ -42,8 +42,8 @@
$method = $wgRequest->getVal( 'method' );
// Handle form sumissions
- if ( $this->editable && $wgRequest->wasPosted() ) {
-
+if ( $this->editable && $wgRequest->wasPosted() &&
$wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) {
+
// Handle removing
$toRemove = $wgRequest->getArray( 'removeNotices' );
if ( isset( $toRemove ) ) {
@@ -185,28 +185,26 @@
// Handle adding of notice
$this->showAll = $wgRequest->getVal( 'showAll' );
- if ( $this->editable && $method == 'addNotice' ) {
+ if ( $this->editable && $method == 'addNotice' &&
$wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) {
$noticeName= $wgRequest->getVal( 'noticeName' );
$start = $wgRequest->getArray( 'start' );
$project_name = $wgRequest->getVal( 'project_name'
);
$project_languages = $wgRequest->getArray(
'project_languages' );
if ( $noticeName == '' ) {
- //$wgOut->addWikiMsg (
'centralnotice-null-string' );
$wgOut->addHTML( Xml::element( 'div', array(
'class' => 'cn-error' ), wfMsg( 'centralnotice-null-string' ) ) );
- }
- else {
+ } else {
$this->addNotice( $noticeName, '0', $start,
$project_name, $project_languages );
}
}
// Handle removing of notice
- if ( $this->editable && $method == 'removeNotice' ) {
+ if ( $this->editable && $method == 'removeNotice' &&
$wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) {
$noticeName = $wgRequest->getVal ( 'noticeName' );
$this->removeNotice ( $noticeName );
}
// Handle adding of template
- if ( $this->editable && $method == 'addTemplateTo' ) {
+ if ( $this->editable && $method == 'addTemplateTo' &&
$wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) {
$noticeName = $wgRequest->getVal( 'noticeName' );
$templateName = $wgRequest->getVal( 'templateName' );
$templateWeight = $wgRequest->getVal ( 'weight' );
@@ -217,7 +215,7 @@
}
// Handle removing of template
- if ( $this->editable && $method == 'removeTemplateFor' ) {
+ if ( $this->editable && $method == 'removeTemplateFor' &&
$wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) {
$noticeName = $wgRequest->getVal ( 'noticeName' );
$templateName = $wgRequest->getVal ( 'templateName ' );
$this->removeTemplateFor( $noticeName , $templateName );
@@ -520,6 +518,7 @@
$htmlOut .= $this->tableRow( $fields );
}
$htmlOut .= Xml::closeElement( 'table' );
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
if ( $this->editable ) {
$htmlOut .= Xml::openElement( 'div', array(
'class' => 'cn-buttons' ) );
$htmlOut .= Xml::submitButton( wfMsg(
'centralnotice-modify' ),
@@ -585,6 +584,7 @@
$htmlOut .= Xml::closeElement( 'tr' );
$htmlOut .= Xml::closeElement( 'table' );
$htmlOut .= Xml::hidden( 'change', 'weight' );
+ $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
// Submit button
$htmlOut .= Xml::tags( 'div',
@@ -604,7 +604,8 @@
function listNoticeDetail( $notice ) {
global $wgOut, $wgRequest, $wgUser;
- if ( $wgRequest->wasPosted() ) {
+ if ( $wgRequest->wa
[MediaWiki-CVS] SVN: [70441] trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70441
Revision: 70441
Author: kaldari
Date: 2010-08-04 00:11:45 + (Wed, 04 Aug 2010)
Log Message:
---
Fix for error in r70440. Two different tokens.
Modified Paths:
--
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:05:48 UTC (rev 70440)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php2010-08-04
00:11:45 UTC (rev 70441)
@@ -335,7 +335,7 @@
$htmlOut .= Xml::closeElement( 'tr' );
}
if ( $this->editable ) {
- $htmlOut .= Xml::hidden( 'authtoken', $token );
+ $htmlOut .= Xml::hidden( 'token', $token );
$htmlOut .= Xml::hidden( 'wpUserLanguage',
$wpUserLang );
$htmlOut .= Xml::openElement( 'tr' );
$htmlOut .= Xml::tags( 'td', array( 'colspan'
=> 4 ),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70439] civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm. module
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70439
Revision: 70439
Author: awjrichards
Date: 2010-08-03 23:37:45 + (Tue, 03 Aug 2010)
Log Message:
---
Updated code to pull correct value for currency conversion and to round amounts
with more than 2 decimal places
Modified Paths:
--
civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
===
--- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 22:55:53 UTC (rev 70438)
+++ civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 23:37:45 UTC (rev 70439)
@@ -222,11 +222,12 @@
}
watchdog('queue2civicrm', 'Contribution (pre-conversion):' .
check_plain(print_r($msg, TRUE)) . '');
+
+ // round the amounts and do exchange rate conversion
+ $msg['fee'] = round( exchange_rate_convert($msg['original_currency'],
$msg['fee'], $msg['date']), 2 );
+ $msg['gross'] = round( exchange_rate_convert($msg['original_currency'],
$msg['gross'], $msg['date']), 2 );
+ $msg['net'] = round( exchange_rate_convert($msg['original_currency'],
$msg['net'], $msg['date']), 2 );
- $msg['fee'] = exchange_rate_convert($msg['currency'], $msg['fee'],
$msg['date']);
- $msg['gross'] = exchange_rate_convert($msg['currency'], $msg['gross'],
$msg['date']);
- $msg['net'] = exchange_rate_convert($msg['currency'], $msg['net'],
$msg['date']);
-
$msg['gateway_txn_id'] .= ' ' . time();
//dsm($contribution);
@@ -284,7 +285,7 @@
watchdog( 'queue2civicrm', 'Contribution array for
civicrm_contribution_add(): ' . print_r($contribution, TRUE));
- $contribution_result = &civicrm_contribution_add( $contribution );
+ $contribution_result = civicrm_contribution_add( $contribution );
watchdog( 'queue2civicrm', 'Contribution result from
civicrm_contribution_add(): ' . print_r($contribution_result, TRUE));
@@ -322,7 +323,7 @@
$form['queue'] = array(
'#type' => 'textfield',
'#title' => 'Queue to submit to',
-'#default_value' => '/queue/test_pending_pfp',
+'#default_value' => '/queue/test_donations',
'#required' => TRUE
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70438] trunk/extensions/Translate/groups/Commonist.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70438
Revision: 70438
Author: siebrand
Date: 2010-08-03 22:55:53 + (Tue, 03 Aug 2010)
Log Message:
---
Remove obsolete file Commonist.php. Has been converted to new style message
group.
Removed Paths:
-
trunk/extensions/Translate/groups/Commonist.php
Deleted: trunk/extensions/Translate/groups/Commonist.php
===
--- trunk/extensions/Translate/groups/Commonist.php 2010-08-03 22:53:36 UTC
(rev 70437)
+++ trunk/extensions/Translate/groups/Commonist.php 2010-08-03 22:55:53 UTC
(rev 70438)
@@ -1,42 +0,0 @@
-fileDir; }
- public function setPath( $value ) { $this->fileDir = $value; }
-
-
- protected $optional = array(
- );
-
- protected $ignored = array(
- );
-
- public function getMessageFile( $code ) {
- if ( $code == 'en' ) {
- return 'messages.properties';
- } else {
- if ( isset( $this->codeMap[$code] ) ) {
- $code = $this->codeMap[$code];
- }
- return "messages_$code.properties";
- }
- }
-
- protected function getFileLocation( $code ) {
- return $this->fileDir . '/' . $this->getMessageFile( $code );
- }
-
- public function getReader( $code ) {
- return new JavaFormatReader( $this->getFileLocation( $code ) );
- }
-
- public function getWriter() {
- return new JavaFormatWriter( $this );
- }
-}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70437] trunk/extensions/Translate/groups/mediawiki-defines.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70437 Revision: 70437 Author: siebrand Date: 2010-08-03 22:53:36 + (Tue, 03 Aug 2010) Log Message: --- Remove obsolete file. Has been converted to new style message group. Modified Paths: -- trunk/extensions/Translate/groups/mediawiki-defines.txt Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt === --- trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-03 22:34:12 UTC (rev 70436) +++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-03 22:53:36 UTC (rev 70437) @@ -121,7 +121,7 @@ Central Auth aliasfile = CentralAuth/CentralAuth.alias.php -optional = centralauth-editset-grouplink, centralauth-admin-notblocked +optional = centralauth-editset-grouplink, centralauth-admin-notblocked, centralauth-listusers-item ignored = centralauth-editset-item-ro Central Notice ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70436] trunk/tools/code-utils/check-vars.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70436
Revision: 70436
Author: platonides
Date: 2010-08-03 22:34:12 + (Tue, 03 Aug 2010)
Log Message:
---
Add detection of calls to deprecated methods.
Currently this is very basic, based just on the method name, and there is a
number of false positives.
Modified Paths:
--
trunk/tools/code-utils/check-vars.php
Modified: trunk/tools/code-utils/check-vars.php
===
--- trunk/tools/code-utils/check-vars.php 2010-08-03 22:33:43 UTC (rev
70435)
+++ trunk/tools/code-utils/check-vars.php 2010-08-03 22:34:12 UTC (rev
70436)
@@ -10,6 +10,9 @@
require_once( dirname( __FILE__ ) . "/../../phase3/includes/Defines.php" ); #
Faster than parsing
require_once( dirname( __FILE__ ) . "/../../phase3/includes/AutoLoader.php" );
+$mwDeprecatedFunctions = false;
+...@include( dirname( __FILE__ ) . "/deprecated.functions" );
+
if ( !extension_loaded( 'sockets' ) ) dl('sockets.so');
if ( !extension_loaded( 'PDO' ) ) dl('pdo.so');
@@ -42,6 +45,7 @@
static $mDefaultSettingsGlobals = null;
static $constantIgnorePrefixes = array( "PGSQL_", "OCI_", "SQLT_BLOB",
"DB2_", "XMLREADER_" ); # Ignore constants with these prefixes
+ protected $generateDeprecatedList = false;
/* Values for status */
const WAITING_FUNCTION = 0;
@@ -54,7 +58,11 @@
const CLASS_NAME = -4;
const CLASS_MEMBER = -5;
const FUNCTION_NAME = -6;
+ const FUNCTION_DEFINITION = -7;
+ /* Function attribute */
+ const FUNCTION_DEPRECATED = -8;
+
function __construct() {
if ( self::$mDefaultSettingsGlobals == null ) {
$this->load( dirname( dirname( dirname( __FILE__ ) ) )
. "/phase3/includes/DefaultSettings.php", false );
@@ -114,6 +122,17 @@
}
}
+ function setGenerateDeprecatedList( $bool = true ) {
+ $this->generateDeprecatedList = $bool;
+ }
+ function getGenerateDeprecatedList() {
+ return $this->generateDeprecatedList;
+ }
+ function saveDeprecatedList( $filename ) {
+ file_put_contents( $filename, "mDeprecatedFunctionList ) . "\n);\n\n" );
+ }
+
+
function load($file, $shortcircuit = true) {
$this->mProblemCount = 0;
$this->mFilename = $file;
@@ -182,6 +201,11 @@
if ( $token == ';' )
$this->mFunctionQualifiers =
array();
+ if ( $token[0] == T_DOC_COMMENT ) {
+ if ( strpos( $token[1],
'@deprecated' ) !== false ) {
+
$this->mFunctionQualifiers[] = self::FUNCTION_DEPRECATED;
+ }
+ }
if ( in_array( $token[0],
self::$functionQualifiers ) ) {
$this->mFunctionQualifiers[] =
$token[0];
}
@@ -191,6 +215,7 @@
if ( ( $lastMeaningfulToken[0] ==
T_CLASS ) && ( $token[0] == T_STRING ) ) {
$this->mKnownFileClasses[] =
$token[1];
+ $this->mClass = $token[1];
}
if ($token[0] != T_FUNCTION)
@@ -206,7 +231,14 @@
$this->mStatus =
self::IN_FUNCTION;
$this->mBraces = 0;
$this->mFunctionGlobals =
array();
+ $currentToken[0] =
self::FUNCTION_DEFINITION;
+ if (
$this->generateDeprecatedList && in_array( self::FUNCTION_DEPRECATED,
$this->mFunctionQualifiers ) ) {
+ if ( ( substr(
$this->mFunction, 0, 2 ) != "__" ) && $this->mClass != 'Image' ) {
+
$this->mDeprecatedFunctionList[] = "/*$this->mClass::*/'$this->mFunction'";
+ }
+ }
+
$this->debug("Entering into
function {$token[1]} at line {$token[2]} ");
[MediaWiki-CVS] SVN: [70435] trunk/extensions/CentralAuth/CentralAuth.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70435 Revision: 70435 Author: siebrand Date: 2010-08-03 22:33:43 + (Tue, 03 Aug 2010) Log Message: --- Fix sloppyness from r70431 Modified Paths: -- trunk/extensions/CentralAuth/CentralAuth.i18n.php Modified: trunk/extensions/CentralAuth/CentralAuth.i18n.php === --- trunk/extensions/CentralAuth/CentralAuth.i18n.php 2010-08-03 22:32:09 UTC (rev 70434) +++ trunk/extensions/CentralAuth/CentralAuth.i18n.php 2010-08-03 22:33:43 UTC (rev 70435) @@ -209,7 +209,7 @@ 'globalusers'=> 'Global user list', 'centralauth-listusers-locked' => 'locked', 'centralauth-listusers-attached' => '[[User:$1|exists locally]]', - 'centralauth-listusers-item' => '$1 ($2) - [[Special:CentralAuth/$1|CentralAuth]]' + 'centralauth-listusers-item' => '$1 ($2) - [[Special:CentralAuth/$1|CentralAuth]]', 'centralauth-listusers-nolocal' => 'unattached or doesn\'t exist locally', // Pretty timespan ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70434] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70434
Revision: 70434
Author: platonides
Date: 2010-08-03 22:32:09 + (Tue, 03 Aug 2010)
Log Message:
---
http://www.mediawiki.org/wiki/User:Catrope/Stub_threshold shows us people
setting it to insanely large values trying to disable it.
r70433 addressed the UI. Here we proxy its access via a new method
getStubThreshold() that disables it if a page of such size cannot be
created (by an user), so we can serve them parser cached articles again.
Modified Paths:
--
trunk/phase3/includes/Article.php
trunk/phase3/includes/Linker.php
trunk/phase3/includes/User.php
trunk/phase3/includes/parser/LinkHolderArray.php
Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php 2010-08-03 22:13:16 UTC (rev 70433)
+++ trunk/phase3/includes/Article.php 2010-08-03 22:32:09 UTC (rev 70434)
@@ -891,7 +891,7 @@
# Should the parser cache be used?
$useParserCache = $this->useParserCache( $oldid );
wfDebug( 'Article::view using parser cache: ' . (
$useParserCache ? 'yes' : 'no' ) . "\n" );
- if ( $wgUser->getOption( 'stubthreshold' ) ) {
+ if ( $wgUser->getStubThreshold() ) {
wfIncrStats( 'pcache_miss_stub' );
}
@@ -1450,7 +1450,7 @@
global $wgUser, $wgEnableParserCache;
return $wgEnableParserCache
- && intval( $wgUser->getOption( 'stubthreshold' ) ) == 0
+ && $wgUser->getStubThreshold() == 0
&& $this->exists()
&& empty( $oldid )
&& !$this->mTitle->isCssOrJsPage()
@@ -4589,13 +4589,13 @@
// Should the parser cache be used?
$useParserCache = $wgEnableParserCache &&
- intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 &&
+ $wgUser->getStubThreshold() == 0 &&
$this->exists() &&
$oldid === null;
wfDebug( __METHOD__ . ': using parser cache: ' . (
$useParserCache ? 'yes' : 'no' ) . "\n" );
- if ( $wgUser->getOption( 'stubthreshold' ) ) {
+ if ( $wgUser->getStubThreshold() ) {
wfIncrStats( 'pcache_miss_stub' );
}
Modified: trunk/phase3/includes/Linker.php
===
--- trunk/phase3/includes/Linker.php2010-08-03 22:13:16 UTC (rev 70433)
+++ trunk/phase3/includes/Linker.php2010-08-03 22:32:09 UTC (rev 70434)
@@ -267,7 +267,7 @@
}
if ( !in_array( 'broken', $options ) ) { # Avoid
useless calls to LinkCache (see r50387)
- $colour = $this->getLinkColour( $target,
$wgUser->getOption( 'stubthreshold' ) );
+ $colour = $this->getLinkColour( $target,
$wgUser->getStubThreshold() );
if ( $colour !== '' ) {
$classes[] = $colour; # mw-redirect or
stub
}
@@ -337,7 +337,7 @@
global $wgUser;
wfDeprecated( __METHOD__ );
- $threshold = intval( $wgUser->getOption( 'stubthreshold' ) );
+ $threshold = $wgUser->getStubThreshold();
$colour = ( $size < $threshold ) ? 'stub' : '';
// FIXME: replace deprecated makeColouredLinkObj by link()
return $this->makeColouredLinkObj( $nt, $colour, $text, $query,
$trail, $prefix );
Modified: trunk/phase3/includes/User.php
===
--- trunk/phase3/includes/User.php 2010-08-03 22:13:16 UTC (rev 70433)
+++ trunk/phase3/includes/User.php 2010-08-03 22:32:09 UTC (rev 70434)
@@ -2079,6 +2079,20 @@
}
/**
+* Get the user preferred stub threshold
+*/
+ function getStubThreshold() {
+ global $wgMaxArticleSize; # Maximum article size, in Kb
+ $threshold = intval( $this->getOption( 'stubthreshold' ) );
+ if ( $threshold > $wgMaxArticleSize * 1024 ) {
+ # If they have set an impossible value, disable the
preference
+ # so we can use the parser cache again.
+ $threshold = 0;
+ }
+ return $threshold;
+ }
+
+ /**
* Get the permissions this user has.
* @return \type{\arrayof{\string}} Array of permission names
*/
@@ -2686,10 +2700,11 @@
}
// stubthreshold is only included below for completeness,
- // it will always be 0 when this func
[MediaWiki-CVS] SVN: [70433] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70433
Revision: 70433
Author: platonides
Date: 2010-08-03 22:13:16 + (Tue, 03 Aug 2010)
Log Message:
---
Use Disabled for the value 0 of stub threshold since there seems to be some
confusion on how to disable it.
Modified Paths:
--
trunk/phase3/includes/Preferences.php
trunk/phase3/languages/messages/MessagesEn.php
Modified: trunk/phase3/includes/Preferences.php
===
--- trunk/phase3/includes/Preferences.php 2010-08-03 22:03:56 UTC (rev
70432)
+++ trunk/phase3/includes/Preferences.php 2010-08-03 22:13:16 UTC (rev
70433)
@@ -583,8 +583,8 @@
);
}
- $stubThresholdValues = array( 0, 50, 100, 500, 1000, 2000,
5000, 1 );
- $stubThresholdOptions = array();
+ $stubThresholdValues = array( 50, 100, 500, 1000, 2000, 5000,
1 );
+ $stubThresholdOptions = array( wfMsg( 'stub-threshold-disabled'
) => 0 );
foreach ( $stubThresholdValues as $value ) {
$stubThresholdOptions[wfMsg( 'size-bytes', $value )] =
$value;
}
Modified: trunk/phase3/languages/messages/MessagesEn.php
===
--- trunk/phase3/languages/messages/MessagesEn.php 2010-08-03 22:03:56 UTC
(rev 70432)
+++ trunk/phase3/languages/messages/MessagesEn.php 2010-08-03 22:13:16 UTC
(rev 70433)
@@ -1751,6 +1751,7 @@
'contextlines' => 'Lines per hit:',
'contextchars' => 'Context per line:',
'stub-threshold'=> 'Threshold for stub link formatting (bytes):',
+'stub-threshold-disabled' => 'Disabled',
'recentchangesdays' => 'Days to show in recent changes:',
'recentchangesdays-max' => 'Maximum $1 {{PLURAL:$1|day|days}}',
'recentchangescount'=> 'Number of edits to show by default:',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70432] trunk/phase3/includes/GlobalFunctions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70432
Revision: 70432
Author: platonides
Date: 2010-08-03 22:03:56 + (Tue, 03 Aug 2010)
Log Message:
---
Typo
Modified Paths:
--
trunk/phase3/includes/GlobalFunctions.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===
--- trunk/phase3/includes/GlobalFunctions.php 2010-08-03 21:55:57 UTC (rev
70431)
+++ trunk/phase3/includes/GlobalFunctions.php 2010-08-03 22:03:56 UTC (rev
70432)
@@ -585,7 +585,7 @@
*defined in languages/Language.php
*
* This function also takes extra optional parameters (not
- * shown in the function definition), which can by used to
+ * shown in the function definition), which can be used to
* insert variable text into the predefined message.
*/
function wfMsg( $key ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70430] trunk/extensions/Babel/Babel.class.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70430
Revision: 70430
Author: simetrical
Date: 2010-08-03 21:43:07 + (Tue, 03 Aug 2010)
Log Message:
---
Fix Babel category sort keys
This actually has nothing to do with my recent category sort changes --
they were always broken. They used $wgUser->getName() instead of
{{PAGENAME}}, so they sorted based on the last one to edit the page.
With new category sort changes, {{PAGENAME}} is redundant, so we don't
even need that.
Modified Paths:
--
trunk/extensions/Babel/Babel.class.php
Modified: trunk/extensions/Babel/Babel.class.php
===
--- trunk/extensions/Babel/Babel.class.php 2010-08-03 21:24:53 UTC (rev
70429)
+++ trunk/extensions/Babel/Babel.class.php 2010-08-03 21:43:07 UTC (rev
70430)
@@ -339,7 +339,7 @@
// Add to main language category if the level is not zero.
if ( $wgBabelUseMainCategories && ( $level === 'N' || (
$wgBabelUseLevelZeroCategory && $level === '0' ) || $level > 0 ) ) {
// Add category wikitext to box tower.
- $r .= "[[Category:{$this->_addFixes( $code,'category'
)}|$level{$wgUser->getName()}]]";
+ $r .= "[[Category:{$this->_addFixes( $code,'category'
)}|$level]]";
BabelAutoCreate::create( $this->_addFixes( "$code",
'category' ), BabelLanguageCodes::getName( $code ) );
}
@@ -349,7 +349,7 @@
if ( !$wgBabelUseSimpleCategories && ( $level === 'N' || (
$wgBabelUseLevelZeroCategory && $level === '0' ) || $level > 0 ) ) {
// Add category wikitext to box tower.
- $r .= "[[Category:{$this->_addFixes(
"$code-$level",'category' )}|{$wgUser->getName()}]]";
+ $r .= "[[Category:{$this->_addFixes(
"$code-$level",'category' )}]]";
BabelAutoCreate::create( $this->_addFixes(
"$code-$level", 'category' ), $level, BabelLanguageCodes::getName( $code ) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70429] branches/resourceloader/phase3/includes/ResourceLoader.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70429
Revision: 70429
Author: tparscal
Date: 2010-08-03 21:24:53 + (Tue, 03 Aug 2010)
Log Message:
---
Updated example in comment to show use of server parameter in
ResourceLoader::respond()
Modified Paths:
--
branches/resourceloader/phase3/includes/ResourceLoader.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
21:23:04 UTC (rev 70428)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
21:24:53 UTC (rev 70429)
@@ -56,7 +56,7 @@
* ) );
* @example
* // Responds to a resource loading request
- * ResourceLoader::respond( $wgRequest );
+ * ResourceLoader::respond( $wgRequest, $wgServer . $wgScriptPath .
'/load.php' );
*/
class ResourceLoader {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70428] branches/resourceloader/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70428
Revision: 70428
Author: tparscal
Date: 2010-08-03 21:23:04 + (Tue, 03 Aug 2010)
Log Message:
---
Made all module options which list files allowed to be given as strings or
arrays
Modified Paths:
--
branches/resourceloader/phase3/includes/ResourceLoader.php
branches/resourceloader/phase3/resources/Resources.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
21:21:54 UTC (rev 70427)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
21:23:04 UTC (rev 70428)
@@ -25,27 +25,34 @@
* @example
* // Registers a module with the resource loading system
* ResourceLoader::register( 'foo', array(
- * // At minimum you must have a script file
+ * // Script or list of scripts to include when implementating the
module (required)
* 'script' => 'resources/foo/foo.js',
- * // Optionally you can have a style file as well
+ * // List of scripts or lists of scripts to include based on the
current language
+ * 'locales' => array(
+ * 'en-gb' => 'resources/foo/locales/en-gb.js',
+ * ),
+ * // Script or list of scripts to include only when in debug mode
+ * 'debug' => 'resources/foo/debug.js',
+ * // If this module is going to be loaded before the mediawiki
module is ready such as jquery or the mediawiki
+ * // module itself, it can be included without special loader
wrapping - this will also limit the module to not be
+ * // able to specify needs, custom loaders, styles, themes or
messages (any of the options below) - raw scripts
+ * // get registered as 'ready' after the mediawiki module is
ready, so they can be named as dependencies
+ * 'raw' => false,
+ * // Modules or list of modules which are needed and should be
used when generating loader code
+ * 'needs' => 'resources/foo/foo.js',
+ * // Script or list of scripts which will cause loader code to
not be generated - if you are doing something fancy
+ * // with your dependencies this gives you a way to use custom
registration code
+ * 'loader' => 'resources/foo/loader.js',
+ * // Style-sheets or list of style-sheets to include
* 'style' => 'resources/foo/foo.css',
- * // List of styles to include based on the skin
+ * // List of style-sheets or lists of style-sheets to include
based on the skin - if no match is found for current
+ * // skin, 'default' is used - if default doesn't exist nothing
is added
* 'themes' => array(
* 'default' => 'resources/foo/themes/default/foo.css',
* 'vector' => 'resources/foo/themes/vector.foo.css',
* ),
- * // List of scripts to include based on the language
- * 'locales' => array(
- * 'en-gb' => 'resources/foo/locales/en-gb.js',
- * ),
- * // Only needed if you are doing something fancy with your
loader, otherwise one will be generated for you
- * 'loader' => 'resources/foo/loader.js',
- * // If you need any localized messages brought into the
JavaScript environment, list the keys here
+ * // List of keys of messages to include
* 'messages' => array( 'foo-hello', 'foo-goodbye' ),
- * // Raw scripts are are loaded without using the loader and can
not bundle loaders, styles and messages
- * 'raw' => false,
- * // Debug-only scripts are special scripts that are only loaded
when requested and while in debug mode
- * 'debug' => false,
* ) );
* @example
* // Responds to a resource loading request
@@ -55,6 +62,7 @@
/* Protected Static Members */
+ // List of modules and their options
protected static $modules = array();
/* Protected Static Methods */
@@ -62,10 +70,10 @@
/**
* Runs text through a filter, caching the filtered result for future
calls
*
-* @param string $filter name of filter to run
-* @param string $data text to filter, such as JavaScript or CSS text
-* @param string $file path to file being filtered, (optional: only
required for CSS to resolve paths)
-* @return string filtered data
+* @param {string} $filter name of filter to run
+* @param {string} $data text to filter, such as JavaScript or CSS text
+* @param {string} $file path to file being filtered, (optional: only
required for CSS to resolve paths)
+* @return {strin
[MediaWiki-CVS] SVN: [70427] branches/resourceloader/phase3/resources/test/index.html
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70427 Revision: 70427 Author: tparscal Date: 2010-08-03 21:21:54 + (Tue, 03 Aug 2010) Log Message: --- Made datepicker bind to a text input (like it's supposed to) rather than a div Modified Paths: -- branches/resourceloader/phase3/resources/test/index.html Modified: branches/resourceloader/phase3/resources/test/index.html === --- branches/resourceloader/phase3/resources/test/index.html2010-08-03 21:11:16 UTC (rev 70426) +++ branches/resourceloader/phase3/resources/test/index.html2010-08-03 21:21:54 UTC (rev 70427) @@ -19,7 +19,7 @@ Datepicker - +
[MediaWiki-CVS] SVN: [70426] trunk/phase3/maintenance/updateCollation.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70426
Revision: 70426
Author: simetrical
Date: 2010-08-03 21:11:16 + (Tue, 03 Aug 2010)
Log Message:
---
Use exact counts in updateCollation.php
There's no reason to avoid a one-time COUNT(*), is there? It will be
free if collations are actually up-to-date, because the column is
indexed.
Modified Paths:
--
trunk/phase3/maintenance/updateCollation.php
Modified: trunk/phase3/maintenance/updateCollation.php
===
--- trunk/phase3/maintenance/updateCollation.php2010-08-03 21:07:13 UTC
(rev 70425)
+++ trunk/phase3/maintenance/updateCollation.php2010-08-03 21:11:16 UTC
(rev 70426)
@@ -30,14 +30,18 @@
global $wgCollationVersion, $wgContLang;
$dbw = wfGetDB( DB_MASTER );
- $count = $dbw->estimateRowCount(
+ $count = $dbw->selectField(
'categorylinks',
- array( 'cl_from', 'cl_to', 'cl_sortkey_prefix' ),
+ 'COUNT(*)',
'cl_collation != ' . $dbw->addQuotes(
$wgCollationVersion ),
__METHOD__
);
- $this->output( "Fixing collation for around $count rows
(estimate might be wrong).\n" );
+ if ( $count == 0 ) {
+ $this->output( "Collations up-to-date.\n" );
+ return;
+ }
+ $this->output( "Fixing collation for $count rows.\n" );
$count = 0;
do {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70425] trunk/phase3/maintenance/updaters.inc
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70425
Revision: 70425
Author: simetrical
Date: 2010-08-03 21:07:13 + (Tue, 03 Aug 2010)
Log Message:
---
Don't run updateCollations if they're up-to-date
I forgot a "return;" here.
Modified Paths:
--
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/maintenance/updaters.inc
===
--- trunk/phase3/maintenance/updaters.inc 2010-08-03 20:59:10 UTC (rev
70424)
+++ trunk/phase3/maintenance/updaters.inc 2010-08-03 21:07:13 UTC (rev
70425)
@@ -1095,6 +1095,7 @@
__FUNCTION__
) == 0 ) {
wfOut( "...collations up-to-date.\n" );
+ return;
}
require_once( 'updateCollation.php' );
$task = new UpdateCollation();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70424] trunk/extensions/LiquidThreads
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70424
Revision: 70424
Author: mah
Date: 2010-08-03 20:59:10 + (Tue, 03 Aug 2010)
Log Message:
---
revert r70106 and switch ordering of addJSandCSS and hook
Modified Paths:
--
trunk/extensions/LiquidThreads/LiquidThreads.php
trunk/extensions/LiquidThreads/classes/View.php
trunk/extensions/LiquidThreads/pages/NewUserMessagesView.php
Modified: trunk/extensions/LiquidThreads/LiquidThreads.php
===
--- trunk/extensions/LiquidThreads/LiquidThreads.php2010-08-03 20:58:40 UTC
(rev 70423)
+++ trunk/extensions/LiquidThreads/LiquidThreads.php2010-08-03 20:59:10 UTC
(rev 70424)
@@ -157,7 +157,6 @@
$wgAutoloadClasses['SpecialNewMessages'] = $dir .
'pages/SpecialNewMessages.php';
$wgAutoloadClasses['SpecialSplitThread'] = $dir .
'pages/SpecialSplitThread.php';
$wgAutoloadClasses['SpecialMergeThread'] = $dir .
'pages/SpecialMergeThread.php';
-$wgAutoloadClasses['SpecialHotTopics'] = "$dir/pages/SpecialHotTopics.php";
// Job queue
$wgJobClasses['synchroniseThreadArticleData'] =
'SynchroniseThreadArticleDataJob';
@@ -237,6 +236,7 @@
/** Whether or not to allow users to activate/deactivate LiquidThreads
per-page */
$wgLiquidThreadsAllowUserControl = true;
-/** Whether or not to allow users to activate/deactivate LiquidThreads in
specific namespaces.
- NULL means either all or none, depending on the above. */
+/** Whether or not to allow users to activate/deactivate LiquidThreads
+ in specific namespaces. NULL means either all or none, depending
+ on the above. */
$wgLiquidThreadsAllowUserControlNamespaces = null;
Modified: trunk/extensions/LiquidThreads/classes/View.php
===
--- trunk/extensions/LiquidThreads/classes/View.php 2010-08-03 20:58:40 UTC
(rev 70423)
+++ trunk/extensions/LiquidThreads/classes/View.php 2010-08-03 20:59:10 UTC
(rev 70424)
@@ -25,7 +25,7 @@
protected $sort_order = LQT_NEWEST_CHANGES;
- static $stylesAndScriptsDone = array();
+ static $stylesAndScriptsDone = false;
function __construct( &$output, &$article, &$title, &$user, &$request )
{
$this->article = $article;
@@ -1182,19 +1182,8 @@
* Output methods *
*/
- static function sendMoreScripts( $scripts = array() ) {
- global $wgOut;
- foreach( $scripts as $file ) {
- if( !in_array( $file, self::$stylesAndScriptsDone ) ) {
- $wgOut->addScriptFile( $file );
- self::$stylesAndScriptsDone[] = $file;
- }
- }
- }
-
- static function addJSandCSS( $scripts = array() ) {
- if ( count( self::$stylesAndScriptsDone ) ) {
- self::sendMoreScripts( $scripts );
+ static function addJSandCSS() {
+ if ( self::$stylesAndScriptsDone ) {
return;
}
@@ -1204,22 +1193,22 @@
LqtHooks::$scriptVariables['wgLqtMessages'] =
self::exportJSLocalisation();
-
- $wgOut->addExtensionStyle(
"$wgLiquidThreadsExtensionPath/jquery/jquery-ui-1.7.2.css" );
- $wgOut->addExtensionStyle(
"$wgLiquidThreadsExtensionPath/lqt.css?{$wgStyleVersion}" );
-
- array_unshift( $scripts,
"$wgLiquidThreadsExtensionPath/js/lqt.toolbar.js" );
- array_unshift( $scripts,
"$wgLiquidThreadsExtensionPath/jquery/jquery.autogrow.js" );
- array_unshift( $scripts, "$wgLiquidThreadsExtensionPath/lqt.js"
);
-
if ( method_exists( $wgOut, 'includeJQuery' ) ) {
$wgOut->includeJQuery();
- array_unshift( $scripts,
"$wgLiquidThreadsExtensionPath/jquery/plugins.js" );
+ $wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/jquery/plugins.js" );
} else {
- array_unshift( $scripts,
"$wgLiquidThreadsExtensionPath/jquery/js2.combined.js" );
+ $wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/jquery/js2.combined.js" );
}
- self::sendMoreScripts( $scripts );
+ $wgOut->addExtensionStyle(
"$wgLiquidThreadsExtensionPath/jquery/jquery-ui-1.7.2.css" );
+
+ $wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/jquery/jquery.autogrow.js" );
+
+ $wgOut->addScriptFile( "$wgLiquidThreadsExtensionPath/lqt.js" );
+ $wgOut->addScriptFile(
"$wgLiquidThreadsExtensionPath/js/lqt.toolbar.js" );
+ $wgOut->addExtensionStyle(
"$wgLiquidThreadsExtensionPath/lqt.css?{$wgStyleVersion}" );
+
+ self::$stylesAndScriptsDone = true;
}
stati
[MediaWiki-CVS] SVN: [70423] trunk/phase3/maintenance/archives/ patch-categorylinks-better-collation.sql
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70423
Revision: 70423
Author: simetrical
Date: 2010-08-03 20:58:40 + (Tue, 03 Aug 2010)
Log Message:
---
Fix breakage for people with DB prefixes
Modified Paths:
--
trunk/phase3/maintenance/archives/patch-categorylinks-better-collation.sql
Modified:
trunk/phase3/maintenance/archives/patch-categorylinks-better-collation.sql
===
--- trunk/phase3/maintenance/archives/patch-categorylinks-better-collation.sql
2010-08-03 20:52:24 UTC (rev 70422)
+++ trunk/phase3/maintenance/archives/patch-categorylinks-better-collation.sql
2010-08-03 20:58:40 UTC (rev 70423)
@@ -2,7 +2,7 @@
-- patch-categorylinks-better-collation.sql
--
-- Bugs 164, 1211, 23682.
-ALTER TABLE categorylinks
+ALTER TABLE /*$wgDBprefix*/categorylinks
ADD COLUMN cl_sortkey_prefix varchar(255) binary NOT NULL default '',
ADD COLUMN cl_collation tinyint NOT NULL default 0,
ADD COLUMN cl_type ENUM('page', 'subcat', 'file') NOT NULL default
'page',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70422] trunk/phase3/includes/installer/CoreInstaller.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70422
Revision: 70422
Author: mah
Date: 2010-08-03 20:52:24 + (Tue, 03 Aug 2010)
Log Message:
---
Whitespace, mis-spelling
Modified Paths:
--
trunk/phase3/includes/installer/CoreInstaller.php
Modified: trunk/phase3/includes/installer/CoreInstaller.php
===
--- trunk/phase3/includes/installer/CoreInstaller.php 2010-08-03 20:51:05 UTC
(rev 70421)
+++ trunk/phase3/includes/installer/CoreInstaller.php 2010-08-03 20:52:24 UTC
(rev 70422)
@@ -3,7 +3,7 @@
/**
* Base core installer class.
* Handles everything that is independent of user interface.
- *
+ *
* @ingroup Deployment
* @since 1.17
*/
@@ -13,7 +13,7 @@
* MediaWiki configuration globals that will eventually be passed
through
* to LocalSettings.php. The names only are given here, the defaults
* typically come from DefaultSettings.php.
-*
+*
* @var array
*/
protected $defaultVarNames = array(
@@ -48,7 +48,7 @@
* Variables that are stored alongside globals, and are used for any
* configuration of the installation process aside from the MediaWiki
* configuration. Map of names to defaults.
-*
+*
* @var array
*/
protected $internalDefaults = array(
@@ -81,7 +81,7 @@
/**
* Steps for installation.
-*
+*
* @var array
*/
protected $installSteps = array(
@@ -94,7 +94,7 @@
/**
* Known object cache types and the functions used to test for their
existence.
-*
+*
* @var array
*/
protected $objectCaches = array(
@@ -106,7 +106,7 @@
/**
* User rights profiles.
-*
+*
* @var array
*/
public $rightsProfiles = array(
@@ -131,7 +131,7 @@
/**
* License types.
-*
+*
* @var array
*/
public $licenses = array(
@@ -169,19 +169,19 @@
);
/**
-* TODO: doucment
-*
+* TODO: document
+*
* @param Status $status
*/
- public abstract function showStatusMessage( Status $status );
-
-
+ public abstract function showStatusMessage( Status $status );
+
+
/**
* Constructor, always call this from child classes.
*/
public function __construct() {
parent::__construct();
-
+
global $wgExtensionMessagesFiles, $wgUser, $wgHooks;
// Load the installer's i18n file.
@@ -195,20 +195,20 @@
$wgHooks['ParserFirstCallInit'][] = array( $this,
'registerDocLink' );
$this->settings = $this->internalDefaults;
-
+
foreach ( $this->defaultVarNames as $var ) {
$this->settings[$var] = $GLOBALS[$var];
}
-
+
foreach ( $this->dbTypes as $type ) {
$installer = $this->getDBInstaller( $type );
-
+
if ( !$installer->isCompiled() ) {
continue;
}
-
+
$defaults = $installer->getGlobalDefaults();
-
+
foreach ( $installer->getGlobalNames() as $var ) {
if ( isset( $defaults[$var] ) ) {
$this->settings[$var] = $defaults[$var];
@@ -225,7 +225,7 @@
/**
* Register tag hook below.
-*
+*
* @param $parser Parser
*/
public function registerDocLink( Parser &$parser ) {
@@ -253,71 +253,71 @@
/**
* Finds extensions that follow the format /extensions/Name/Name.php,
* and returns an array containing the value for 'Name' for each found
extension.
-*
+*
* @return array
*/
public function findExtensions() {
if( $this->getVar( 'IP' ) === null ) {
return false;
}
-
+
$exts = array();
$dir = $this->getVar( 'IP' ) . '/extensions';
$dh = opendir( $dir );
-
+
while ( ( $file = readdir( $dh ) ) !== false ) {
if( file_exists( "$dir/$file/$file.php" ) ) {
$exts[] = $file;
}
}
-
+
$this->setVar( '_Extensions', $exts );
-
+
return $exts;
}
-
+
/**
* Installs the auto-detected extensions.
-*
+*
* TODO: this
[MediaWiki-CVS] SVN: [70421] trunk/phase3/RELEASE-NOTES
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70421 Revision: 70421 Author: simetrical Date: 2010-08-03 20:51:05 + (Tue, 03 Aug 2010) Log Message: --- RELEASE-NOTES for category changes Modified Paths: -- trunk/phase3/RELEASE-NOTES Modified: trunk/phase3/RELEASE-NOTES === --- trunk/phase3/RELEASE-NOTES 2010-08-03 20:50:58 UTC (rev 70420) +++ trunk/phase3/RELEASE-NOTES 2010-08-03 20:51:05 UTC (rev 70421) @@ -125,6 +125,13 @@ * (bug 24563) Entries on Special:WhatLinksHere now have a link to their history * (bug 21503) There's now a "reason" field when creating account for other users * (bug 24418) action=markpatrolled now requires a token +* A variety of category sort-related fixes, including: +** (bug 164) In English, lowercase and uppercase letters now sort the same. + (This should be expanded to proper sorting for other languages before the + 1.17 release.) +** (bug 1211) Subcategories, ordinary pages, and files now page separately. +** When several pages are given the same sort key, they sort by their names + instead of randomly. === Bug fixes in 1.17 === * (bug 17560) Half-broken deletion moved image files to deletion archive ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70420] trunk/phase3/includes/CategoryPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70420 Revision: 70420 Author: simetrical Date: 2010-08-03 20:50:58 + (Tue, 03 Aug 2010) Log Message: --- Clean up code now that the old path is gone Modified Paths: -- trunk/phase3/includes/CategoryPage.php Modified: trunk/phase3/includes/CategoryPage.php === --- trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:52 UTC (rev 70419) +++ trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:58 UTC (rev 70420) @@ -247,18 +247,6 @@ $dbr = wfGetDB( DB_SLAVE, 'category' ); - $tables = array( 'page', 'categorylinks', 'category' ); - $fields = array( 'page_title', 'page_namespace', 'page_len', - 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title', - 'cat_subcats', 'cat_pages', 'cat_files' ); - $conds = array( 'cl_to' => $this->title->getDBkey() ); - $opts = array( - 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ), - 'LIMIT' => $this->limit + 1, - ); - $joins = array( 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ), - 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ); - $this->nextPage = array( 'page' => null, 'subcat' => null, @@ -281,12 +269,21 @@ } $res = $dbr->select( - $tables, - array_merge( $fields, array( 'cl_sortkey_prefix' ) ), - $conds + $extraConds, + array( 'page', 'categorylinks', 'category' ), + array( 'page_title', 'page_namespace', 'page_len', + 'page_is_redirect', 'cl_sortkey', 'cat_id', 'cat_title', + 'cat_subcats', 'cat_pages', 'cat_files', 'cl_sortkey_prefix' ), + array( 'cl_to' => $this->title->getDBkey() ) + $extraConds, __METHOD__, - $opts + array( 'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey' ), - $joins + array( + 'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ), + 'LIMIT' => $this->limit + 1, + 'ORDER BY' => $this->flip[$type] ? 'cl_sortkey DESC' : 'cl_sortkey', + ), + array( + 'categorylinks' => array( 'INNER JOIN', 'cl_from = page_id' ), + 'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) + ) ); $count = 0; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70419] trunk/phase3/includes/CategoryPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70419 Revision: 70419 Author: simetrical Date: 2010-08-03 20:50:52 + (Tue, 03 Aug 2010) Log Message: --- Don't duplicate the "title" query parameter Kind of hacky to just unset this one parameter, but it's what Pager.php does. Modified Paths: -- trunk/phase3/includes/CategoryPage.php Modified: trunk/phase3/includes/CategoryPage.php === --- trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:46 UTC (rev 70418) +++ trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:52 UTC (rev 70419) @@ -86,6 +86,7 @@ $this->limit = $wgCategoryPagingLimit; $this->cat = Category::newFromTitle( $title ); $this->query = $query; + unset( $this->query['title'] ); } /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70418] trunk/phase3/includes/CategoryPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70418
Revision: 70418
Author: simetrical
Date: 2010-08-03 20:50:46 + (Tue, 03 Aug 2010)
Log Message:
---
Fix bug in sorting due to $wgRequest eating nulls
I'll fix this up so that the query string looks nicer later. Embedding
nulls in query strings is not a great idea.
Modified Paths:
--
trunk/phase3/includes/CategoryPage.php
Modified: trunk/phase3/includes/CategoryPage.php
===
--- trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:38 UTC (rev
70417)
+++ trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:46 UTC (rev
70418)
@@ -55,11 +55,14 @@
$from = $until = array();
foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
- $from[$type] = $wgRequest->getVal( "{$type}from" );
- $until[$type] = $wgRequest->getVal( "{$type}until" );
+ # Use $_GET instead of $wgRequest, because the latter
helpfully
+ # normalizes Unicode, which removes nulls. TODO: do
something
+ # smarter than passing nulls in URLs. :/
+ $from[$type] = isset( $_GET["{$type}from"] ) ?
$_GET["{$type}from"] : null;
+ $until[$type] = isset( $_GET["{$type}until"] ) ?
$_GET["{$type}until"] : null;
}
- $viewer = new CategoryViewer( $this->mTitle, $from, $until,
$wgRequest->getValues() );
+ $viewer = new CategoryViewer( $this->mTitle, $from, $until,
$_GET );
$wgOut->addHTML( $viewer->getHTML() );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70417] trunk/phase3/includes/Title.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70417
Revision: 70417
Author: simetrical
Date: 2010-08-03 20:50:38 + (Tue, 03 Aug 2010)
Log Message:
---
Fix page moves with new category sort scheme
Some other things might have to be updated, like the API and extensions.
Modified Paths:
--
trunk/phase3/includes/Title.php
Modified: trunk/phase3/includes/Title.php
===
--- trunk/phase3/includes/Title.php 2010-08-03 20:50:31 UTC (rev 70416)
+++ trunk/phase3/includes/Title.php 2010-08-03 20:50:38 UTC (rev 70417)
@@ -3026,6 +3026,8 @@
* @return \type{\mixed} true on success,
getUserPermissionsErrors()-like array on failure
*/
public function moveTo( &$nt, $auth = true, $reason = '',
$createRedirect = true ) {
+ global $wgContLang;
+
$err = $this->isValidMoveOperation( $nt, $auth, $reason );
if ( is_array( $err ) ) {
return $err;
@@ -3058,24 +3060,19 @@
}
$redirid = $this->getArticleID();
- // Category memberships include a sort key which may be
customized.
- // If it's left as the default (the page title), we need to
update
- // the sort key to match the new title.
- //
- // Be careful to avoid resetting cl_timestamp, which may disturb
- // time-based lists on some sites.
- //
- // Warning -- if the sort key is *explicitly* set to the old
title,
- // we can't actually distinguish it from a default here, and
it'll
- // be set to the new title even though it really shouldn't.
- // It'll get corrected on the next edit, but resetting
cl_timestamp.
+ // Refresh the sortkey for this row. Be careful to avoid
resetting
+ // cl_timestamp, which may disturb time-based lists on some
sites.
+ $prefix = $dbw->selectField(
+ 'categorylinks',
+ 'cl_sortkey_prefix',
+ array( 'cl_from' => $pageid ),
+ __METHOD__
+ );
$dbw->update( 'categorylinks',
array(
- 'cl_sortkey' => $nt->getPrefixedText(),
+ 'cl_sortkey' => $wgContLang->convertToSortkey(
$nt->getCategorySortkey( $prefix ) ),
'cl_timestamp=cl_timestamp' ),
- array(
- 'cl_from' => $pageid,
- 'cl_sortkey' => $this->getPrefixedText() ),
+ array( 'cl_from' => $pageid ),
__METHOD__ );
if ( $protected ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70416] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70416
Revision: 70416
Author: simetrical
Date: 2010-08-03 20:50:31 + (Tue, 03 Aug 2010)
Log Message:
---
Sort pages in categories without namespace prefix
This removes $wgCategoryPrefixedDefaultSortkey and effectively always
makes it false. The setting was added in the first place to hack around
the default, clearly broken behavior, but this just fixes it instead, so
the setting is no longer needed.
Running maintenance/updateCollation.php for the first time will fix
this, no need to run refreshLinks.php. If you've already run
updateCollation.php, you can do UPDATE categorylinks SET cl_collation =
76; or such and then run the script again.
Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Title.php
trunk/phase3/maintenance/updateCollation.php
Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES 2010-08-03 20:50:01 UTC (rev 70415)
+++ trunk/phase3/RELEASE-NOTES 2010-08-03 20:50:31 UTC (rev 70416)
@@ -48,6 +48,8 @@
normal $wgDBport.
* The upload link for missing files can now be set separately from the
navigation link with $wgUploadMissingFileUrl.
+* $wgCategoryPrefixedDefaultSortkey was removed and is now always false. This
+ provides more sensible sorting behavior for categories.
=== New features in 1.17 ===
* (bug 10183) Users can now add personal styles and scripts to all skins via
Modified: trunk/phase3/includes/DefaultSettings.php
===
--- trunk/phase3/includes/DefaultSettings.php 2010-08-03 20:50:01 UTC (rev
70415)
+++ trunk/phase3/includes/DefaultSettings.php 2010-08-03 20:50:31 UTC (rev
70416)
@@ -4467,12 +4467,6 @@
$wgCategoryPagingLimit = 200;
/**
- * Should the default category sortkey be the prefixed title?
- * Run maintenance/refreshLinks.php after changing this.
- */
-$wgCategoryPrefixedDefaultSortkey = true;
-
-/**
* A version indicator for collations that will be stored in cl_collation for
* all new rows. Used when the collation algorithm changes: a script checks
* for all rows where cl_collation != $wgCollationVersion and regenerates
Modified: trunk/phase3/includes/Title.php
===
--- trunk/phase3/includes/Title.php 2010-08-03 20:50:01 UTC (rev 70415)
+++ trunk/phase3/includes/Title.php 2010-08-03 20:50:31 UTC (rev 70416)
@@ -4149,13 +4149,7 @@
* @return string
*/
public function getCategorySortkey( $prefix = '' ) {
- global $wgCategoryPrefixedDefaultSortkey;
- if ( $this->getNamespace() == NS_CATEGORY
- || !$wgCategoryPrefixedDefaultSortkey ) {
- $unprefixed = $this->getText();
- } else {
- $unprefixed = $this->getPrefixedText();
- }
+ $unprefixed = $this->getText();
if ( $prefix !== '' ) {
# Separate with a null byte, so the unprefixed part is
only used as
# a tiebreaker when two pages have the exact same
prefix -- null
Modified: trunk/phase3/maintenance/updateCollation.php
===
--- trunk/phase3/maintenance/updateCollation.php2010-08-03 20:50:01 UTC
(rev 70415)
+++ trunk/phase3/maintenance/updateCollation.php2010-08-03 20:50:31 UTC
(rev 70416)
@@ -60,7 +60,8 @@
if ( $row->cl_collation == 0 ) {
# This is an old-style row, so the
sortkey needs to be
# converted.
- if ( $row->cl_sortkey ==
$title->getCategorySortkey() ) {
+ if ( $row->cl_sortkey ==
$title->getText()
+ || $row->cl_sortkey ==
$title->getPrefixedText() ) {
$prefix = '';
} else {
# Custom sortkey, use it as a
prefix
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70415] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70415
Revision: 70415
Author: simetrical
Date: 2010-08-03 20:50:01 + (Tue, 03 Aug 2010)
Log Message:
---
Enable new category sort by default
Patch best viewed with whitespace changes ignored. This will doubtless
introduce a bunch of bugs. Please report any so I can fix them. If
they're big enough and the fix isn't obvious, please revert.
Modified Paths:
--
trunk/phase3/includes/CategoryPage.php
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/LinksUpdate.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/maintenance/archives/patch-categorylinks-better-collation.sql
trunk/phase3/maintenance/updateCollation.php
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/CategoryPage.php
===
--- trunk/phase3/includes/CategoryPage.php 2010-08-03 20:48:10 UTC (rev
70414)
+++ trunk/phase3/includes/CategoryPage.php 2010-08-03 20:50:01 UTC (rev
70415)
@@ -51,17 +51,12 @@
}
function closeShowCategory() {
- global $wgOut, $wgRequest, $wgExperimentalCategorySort;
+ global $wgOut, $wgRequest;
- if ( $wgExperimentalCategorySort ) {
- $from = $until = array();
- foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
- $from[$type] = $wgRequest->getVal(
"{$type}from" );
- $until[$type] = $wgRequest->getVal(
"{$type}until" );
- }
- } else {
- $from = $wgRequest->getVal( 'from' );
- $until = $wgRequest->getVal( 'until' );
+ $from = $until = array();
+ foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
+ $from[$type] = $wgRequest->getVal( "{$type}from" );
+ $until[$type] = $wgRequest->getVal( "{$type}until" );
}
$viewer = new CategoryViewer( $this->mTitle, $from, $until,
$wgRequest->getValues() );
@@ -184,7 +179,7 @@
* else use sortkey...
*/
function getSubcategorySortChar( $title, $sortkey ) {
- global $wgContLang, $wgExperimentalCategorySort;
+ global $wgContLang;
if ( $title->getPrefixedText() == $sortkey ) {
$word = $title->getDBkey();
@@ -192,11 +187,7 @@
$word = $sortkey;
}
- if ( $wgExperimentalCategorySort ) {
- $firstChar = $wgContLang->firstLetterForLists( $word );
- } else {
- $firstChar = $wgContLang->firstChar( $word );
- }
+ $firstChar = $wgContLang->firstLetterForLists( $word );
return $wgContLang->convert( $firstChar );
}
@@ -206,12 +197,7 @@
*/
function addImage( Title $title, $sortkey, $pageLength, $isRedirect =
false ) {
if ( $this->showGallery ) {
- global $wgExperimentalCategorySort;
- if ( $wgExperimentalCategorySort ) {
- $flip = $this->flip['file'];
- } else {
- $flip = $this->flip;
- }
+ $flip = $this->flip['file'];
if ( $flip ) {
$this->gallery->insert( $title );
} else {
@@ -226,7 +212,7 @@
* Add a miscellaneous page
*/
function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
- global $wgContLang, $wgExperimentalCategorySort;
+ global $wgContLang;
$this->articles[] = $isRedirect
? '' .
$this->getSkin()->link(
@@ -238,29 +224,22 @@
) . ''
: $this->getSkin()->link( $title );
- if ( $wgExperimentalCategorySort ) {
- $this->articles_start_char[] = $wgContLang->convert(
$wgContLang->firstLetterForLists( $sortkey ) );
- } else {
- $this->articles_start_char[] = $wgContLang->convert(
$wgContLang->firstChar( $sortkey ) );
- }
+ $this->articles_start_char[] = $wgContLang->convert(
$wgContLang->firstLetterForLists( $sortkey ) );
}
function finaliseCategoryState() {
- global $wgExperimentalCategorySort;
- if ( ( !$wgExperimentalCategorySort && $this->flip )
- || ( $wgExperimentalCategorySort && $this->flip['subcat'] ) )
{
+ if ( $this->flip['subcat'] ) {
$this->children= array_r
[MediaWiki-CVS] SVN: [70413] trunk/extensions/LiquidThreads/classes/View.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70413
Revision: 70413
Author: mah
Date: 2010-08-03 20:43:29 + (Tue, 03 Aug 2010)
Log Message:
---
re r70100, Reflect usage in core and discard hook return value.
Modified Paths:
--
trunk/extensions/LiquidThreads/classes/View.php
Modified: trunk/extensions/LiquidThreads/classes/View.php
===
--- trunk/extensions/LiquidThreads/classes/View.php 2010-08-03 20:39:35 UTC
(rev 70412)
+++ trunk/extensions/LiquidThreads/classes/View.php 2010-08-03 20:43:29 UTC
(rev 70413)
@@ -1898,10 +1898,9 @@
$replyTo = $this->methodAppliesToThread( 'reply', $thread );
$html = '';
- if ( wfRunHooks( 'EditPageBeforeEditToolbar', array( &$html ) )
) {
- $scripts = isset( $options['addScripts'] ) ?
$options['addScripts'] : array();
- self::addJSandCSS( $scripts );
- }
+ wfRunHooks( 'EditPageBeforeEditToolbar', array( &$html ) );
+ $scripts = isset( $options['addScripts'] ) ?
$options['addScripts'] : array();
+ self::addJSandCSS( $scripts );
$class = $this->threadDivClass( $thread );
if ( $levelNum == 1 ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70412] trunk/phase3/includes/GlobalFunctions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70412
Revision: 70412
Author: nikerabbit
Date: 2010-08-03 20:39:35 + (Tue, 03 Aug 2010)
Log Message:
---
Follow up to r69185: add documentation for wfUILang()
Modified Paths:
--
trunk/phase3/includes/GlobalFunctions.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===
--- trunk/phase3/includes/GlobalFunctions.php 2010-08-03 20:33:41 UTC (rev
70411)
+++ trunk/phase3/includes/GlobalFunctions.php 2010-08-03 20:39:35 UTC (rev
70412)
@@ -563,6 +563,13 @@
return $wgContLang;
}
+/**
+ * Use this instead of $wgContLang, when working with user interface.
+ * User interface is currently hard coded according to wiki content language
+ * in many ways, especially regarding to text direction. There is lots stuff
+ * to fix, hence this function to keep the old behaviour unless the global
+ * $wgBetterDirectionality is enabled (or removed when everything works).
+ */
function wfUILang() {
global $wgBetterDirectionality;
return wfGetLangObj( $wgBetterDirectionality ? false: true );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70411] branches/iwtransclusion/phase3/includes/parser/Parser.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70411
Revision: 70411
Author: peter17
Date: 2010-08-03 20:33:41 + (Tue, 03 Aug 2010)
Log Message:
---
Fix an issue of r69853
Modified Paths:
--
branches/iwtransclusion/phase3/includes/parser/Parser.php
Modified: branches/iwtransclusion/phase3/includes/parser/Parser.php
===
--- branches/iwtransclusion/phase3/includes/parser/Parser.php 2010-08-03
20:12:40 UTC (rev 70410)
+++ branches/iwtransclusion/phase3/includes/parser/Parser.php 2010-08-03
20:33:41 UTC (rev 70411)
@@ -3123,7 +3123,7 @@
}
$title = Title::newFromText( $part1, $ns );
if ( $title ) {
- if ( $piece['interwiki'] !== '' ) {
+ if ( !$title->isExternal() &&
$piece['interwiki'] !== '' ) {
$title->setInterwiki(
$piece['interwiki'] );
}
$titleText = $title->getPrefixedText();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70410] civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm. module
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70410
Revision: 70410
Author: awjrichards
Date: 2010-08-03 20:12:40 + (Tue, 03 Aug 2010)
Log Message:
---
Added a 'break' in batch processing so script will stop when no more items in
the queue
Modified Paths:
--
civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
===
--- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 20:08:57 UTC (rev 70409)
+++ civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 20:12:40 UTC (rev 70410)
@@ -122,6 +122,8 @@
$success = queue2civicrm_dequeue();
if ($success) {
++$processed;
+} else {
+ break;
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70408] civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm. module
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70408
Revision: 70408
Author: awjrichards
Date: 2010-08-03 20:07:20 + (Tue, 03 Aug 2010)
Log Message:
---
Made a fix for handling NULL donor comments in batch processing
Modified Paths:
--
civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
===
--- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 20:05:38 UTC (rev 70407)
+++ civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 20:07:20 UTC (rev 70408)
@@ -277,7 +277,7 @@
'receive_date' => date('Y-m-d H:i:s', $msg['date']),
'currency' => 'USD',
'source' => $msg['original_currency'] . ' ' . $msg['original_gross'],
-'custom_45' => $msg['comment']
+'custom_45' => ( $msg['comment'] ) ? $msg['comment'] : '',
);
watchdog( 'queue2civicrm', 'Contribution array for
civicrm_contribution_add(): ' . print_r($contribution, TRUE));
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70407] trunk/phase3/includes/api/ApiLogin.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70407
Revision: 70407
Author: siebrand
Date: 2010-08-03 20:05:38 + (Tue, 03 Aug 2010)
Log Message:
---
Follow-up r69898: fix Undefined variable: wgCookiePrefix in /ApiLogin.php on
line 94
Modified Paths:
--
trunk/phase3/includes/api/ApiLogin.php
Modified: trunk/phase3/includes/api/ApiLogin.php
===
--- trunk/phase3/includes/api/ApiLogin.php 2010-08-03 19:46:18 UTC (rev
70406)
+++ trunk/phase3/includes/api/ApiLogin.php 2010-08-03 20:05:38 UTC (rev
70407)
@@ -68,9 +68,12 @@
}
$loginForm = new LoginForm( $req );
+
+ global $wgCookiePrefix;
+
switch ( $authRes = $loginForm->authenticateUserData() ) {
case LoginForm::SUCCESS:
- global $wgUser, $wgCookiePrefix;
+ global $wgUser;
$wgUser->setOption( 'rememberpassword', 1 );
$wgUser->setCookies();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70406] trunk/phase3/includes/Hooks.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70406
Revision: 70406
Author: nikerabbit
Date: 2010-08-03 19:46:18 + (Tue, 03 Aug 2010)
Log Message:
---
Follow-up r70109: use restore_error_handler()
Modified Paths:
--
trunk/phase3/includes/Hooks.php
Modified: trunk/phase3/includes/Hooks.php
===
--- trunk/phase3/includes/Hooks.php 2010-08-03 19:45:08 UTC (rev 70405)
+++ trunk/phase3/includes/Hooks.php 2010-08-03 19:46:18 UTC (rev 70406)
@@ -147,7 +147,7 @@
* problem here.
*/
$retval = null;
- $handler = set_error_handler( 'hookErrorHandler' );
+ set_error_handler( 'hookErrorHandler' );
wfProfileIn( $func );
try {
$retval = call_user_func_array( $callback, $hook_args );
@@ -155,11 +155,9 @@
$badhookmsg = $e->getMessage();
}
wfProfileOut( $func );
- // Need to check for null, because set_error_handler borks on
it... sigh
- if ( $handler !== null ) set_error_handler( $handler );
+ restore_error_handler();
/* String return is an error; false return means stop
processing. */
-
if ( is_string( $retval ) ) {
global $wgOut;
$wgOut->showFatalError( $retval );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70405] civicrm/trunk/sites/all/modules/queue2civicrm
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70405
Revision: 70405
Author: awjrichards
Date: 2010-08-03 19:45:08 + (Tue, 03 Aug 2010)
Log Message:
---
Added a few watchdog statements during queue consumption when pushing contribs
into CiviCRM
Modified bootstrap level for drush script to allow drush to execute script as a
specified user
Modified Paths:
--
civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
civicrm/trunk/sites/all/modules/queue2civicrm/queue_consume.drush.inc
Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
===
--- civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 19:37:46 UTC (rev 70404)
+++ civicrm/trunk/sites/all/modules/queue2civicrm/queue2civicrm.module
2010-08-03 19:45:08 UTC (rev 70405)
@@ -276,11 +276,17 @@
'trxn_id' => strtoupper($msg['gateway']) . ' ' .
$msg['gateway_txn_id'],
'receive_date' => date('Y-m-d H:i:s', $msg['date']),
'currency' => 'USD',
- 'source' => $msg['original_currency'] . ' ' .
$msg['original_gross'],
- 'custom_45' => $msg['comment']
- );
- $contribution_result = &civicrm_contribution_add( $contribution );
- $contribution['id'] = $contribution_result['id'];
+'source' => $msg['original_currency'] . ' ' . $msg['original_gross'],
+'custom_45' => $msg['comment']
+ );
+
+ watchdog( 'queue2civicrm', 'Contribution array for
civicrm_contribution_add(): ' . print_r($contribution, TRUE));
+
+ $contribution_result = &civicrm_contribution_add( $contribution );
+
+ watchdog( 'queue2civicrm', 'Contribution result from
civicrm_contribution_add(): ' . print_r($contribution_result, TRUE));
+
+ $contribution['id'] = $contribution_result['id'];
// Send thank you email
module_invoke_all('queue2civicrm_import', $contribution['id']);
Modified: civicrm/trunk/sites/all/modules/queue2civicrm/queue_consume.drush.inc
===
--- civicrm/trunk/sites/all/modules/queue2civicrm/queue_consume.drush.inc
2010-08-03 19:37:46 UTC (rev 70404)
+++ civicrm/trunk/sites/all/modules/queue2civicrm/queue_consume.drush.inc
2010-08-03 19:45:08 UTC (rev 70405)
@@ -17,7 +17,6 @@
'Consumes items from a specified ActiveMQ queue and processes them into
CiviCRM',
'examples' => array( 'drush queue-consume' ),
'aliases' => array( 'qc' ),
-'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_FULL // fully bootstrap drupal, i
think this is what we need...
);
return $items;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70404] trunk/phase3/includes/db/DatabaseIbm_db2.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70404
Revision: 70404
Author: platonides
Date: 2010-08-03 19:37:46 + (Tue, 03 Aug 2010)
Log Message:
---
If getMasterPos can be safely inherited, so can setFakeMaster
Modified Paths:
--
trunk/phase3/includes/db/DatabaseIbm_db2.php
Modified: trunk/phase3/includes/db/DatabaseIbm_db2.php
===
--- trunk/phase3/includes/db/DatabaseIbm_db2.php2010-08-03 19:25:09 UTC
(rev 70403)
+++ trunk/phase3/includes/db/DatabaseIbm_db2.php2010-08-03 19:37:46 UTC
(rev 70404)
@@ -214,6 +214,7 @@
* getSlavePos
* getMasterPos
* getLag
+* setFakeMaster
*
* Generation: (9)
* tableNames
@@ -287,8 +288,7 @@
* select [Done]
*
* Slave/master: 2 / 2
-* setFakeSlaveLag [Done]
-* setFakeMaster [Done]
+* setFakeSlaveLag [Done] - Where??
*
* Reflection: 5 / 5
* indexInfo [Done]
@@ -1502,11 +1502,6 @@
public function getStatus( $which="%" ) { $this->installPrint('Not
implemented for DB2: getStatus()'); return ''; }
/**
* Not implemented
-* @deprecated
-*/
- public function setFakeMaster( $enabled = true ) {
$this->installPrint('Not implemented for DB2: setFakeMaster()'); }
- /**
-* Not implemented
* @return string $sql
* @deprecated
*/
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70403] trunk/extensions/UploadWizard/SpecialUploadWizard.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70403
Revision: 70403
Author: maxsem
Date: 2010-08-03 19:25:09 + (Tue, 03 Aug 2010)
Log Message:
---
Follow-up to r70401: remove loadAllMessages() from an extension too
Modified Paths:
--
trunk/extensions/UploadWizard/SpecialUploadWizard.php
Modified: trunk/extensions/UploadWizard/SpecialUploadWizard.php
===
--- trunk/extensions/UploadWizard/SpecialUploadWizard.php 2010-08-03
19:17:55 UTC (rev 70402)
+++ trunk/extensions/UploadWizard/SpecialUploadWizard.php 2010-08-03
19:25:09 UTC (rev 70403)
@@ -39,7 +39,7 @@
* @param subpage, e.g. the "foo" in Special:UploadWizard/foo.
*/
public function execute( $subPage ) {
- global $wgUser, $wgOut, $wgMessageCache;
+ global $wgUser, $wgOut;
# Check uploading enabled
if( !UploadBase::isEnabled() ) {
@@ -73,8 +73,6 @@
}
- $wgMessageCache->loadAllMessages();
-
$this->setHeaders();
$this->outputHeader();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70401] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70401
Revision: 70401
Author: platonides
Date: 2010-08-03 19:15:43 + (Tue, 03 Aug 2010)
Log Message:
---
Remove all calls to $wgMessageCache->loadAllMessages()
Deprecated and empty since r52503
Modified Paths:
--
trunk/phase3/includes/Article.php
trunk/phase3/includes/EditPage.php
trunk/phase3/includes/LogPage.php
trunk/phase3/includes/RevisionDelete.php
trunk/phase3/includes/User.php
trunk/phase3/includes/specials/SpecialListgrouprights.php
trunk/phase3/includes/specials/SpecialTags.php
trunk/phase3/includes/specials/SpecialVersion.php
Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php 2010-08-03 19:15:23 UTC (rev 70400)
+++ trunk/phase3/includes/Article.php 2010-08-03 19:15:43 UTC (rev 70401)
@@ -260,7 +260,6 @@
if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
# If this is a system message, get the default
text.
list( $message, $lang ) =
$wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText()
) );
- $wgMessageCache->loadAllMessages( $lang );
$text = wfMsgGetKey( $message, false, $lang,
false );
if ( wfEmptyMsg( $message, $text ) )
Modified: trunk/phase3/includes/EditPage.php
===
--- trunk/phase3/includes/EditPage.php 2010-08-03 19:15:23 UTC (rev 70400)
+++ trunk/phase3/includes/EditPage.php 2010-08-03 19:15:43 UTC (rev 70401)
@@ -143,7 +143,6 @@
if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
# If this is a system message, get the default
text.
list( $message, $lang ) =
$wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText()
) );
- $wgMessageCache->loadAllMessages( $lang );
$text = wfMsgGetKey( $message, false, $lang,
false );
if( wfEmptyMsg( $message, $text ) )
$text = $this->getPreloadedText(
$preload );
Modified: trunk/phase3/includes/LogPage.php
===
--- trunk/phase3/includes/LogPage.php 2010-08-03 19:15:23 UTC (rev 70400)
+++ trunk/phase3/includes/LogPage.php 2010-08-03 19:15:43 UTC (rev 70401)
@@ -147,10 +147,9 @@
* @return String: log name
*/
public static function logName( $type ) {
- global $wgLogNames, $wgMessageCache;
+ global $wgLogNames;
if( isset( $wgLogNames[$type] ) ) {
- $wgMessageCache->loadAllMessages();
return str_replace( '_', ' ', wfMsg( $wgLogNames[$type]
) );
} else {
// Bogus log types? Perhaps an extension was removed.
@@ -166,8 +165,7 @@
* @return String: headertext of this logtype
*/
public static function logHeader( $type ) {
- global $wgLogHeaders, $wgMessageCache;
- $wgMessageCache->loadAllMessages();
+ global $wgLogHeaders;
return wfMsgExt($wgLogHeaders[$type], array( 'parseinline' ) );
}
@@ -186,9 +184,8 @@
public static function actionText( $type, $action, $title = null, $skin
= null,
$params = array(), $filterWikilinks = false )
{
- global $wgLang, $wgContLang, $wgLogActions, $wgMessageCache;
+ global $wgLang, $wgContLang, $wgLogActions;
- $wgMessageCache->loadAllMessages();
$key = "$type/$action";
# Defer patrol log to PatrolLog class
if( $key == 'patrol/patrol' ) {
Modified: trunk/phase3/includes/RevisionDelete.php
===
--- trunk/phase3/includes/RevisionDelete.php2010-08-03 19:15:23 UTC (rev
70400)
+++ trunk/phase3/includes/RevisionDelete.php2010-08-03 19:15:43 UTC (rev
70401)
@@ -1302,8 +1302,6 @@
var $authorNameField = 'log_user_text';
public function doQuery( $db ) {
- global $wgMessageCache;
- $wgMessageCache->loadAllMessages();
$ids = array_map( 'intval', $this->ids );
return $db->select( 'logging', '*',
array( 'log_id' => $ids ),
Modified: trunk/phase3/includes/User.php
===
--- trunk/phase3/includes/User.php 2010-08-03 19:15:23 UTC (rev 70400)
+++ trunk/phase3/includes/User.php 2010-08-03 19:15:43 UTC (rev 70401)
@@ -3200,8 +3200
[MediaWiki-CVS] SVN: [70400] trunk/phase3/includes/installer/Installer.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70400
Revision: 70400
Author: siebrand
Date: 2010-08-03 19:15:23 + (Tue, 03 Aug 2010)
Log Message:
---
Use int: to keep references consistent.
Modified Paths:
--
trunk/phase3/includes/installer/Installer.i18n.php
Modified: trunk/phase3/includes/installer/Installer.i18n.php
===
--- trunk/phase3/includes/installer/Installer.i18n.php 2010-08-03 18:45:50 UTC
(rev 70399)
+++ trunk/phase3/includes/installer/Installer.i18n.php 2010-08-03 19:15:23 UTC
(rev 70400)
@@ -354,11 +354,11 @@
However, many have found MediaWiki to be useful in a wide variety of roles,
and sometimes it is not easy to convince everyone of the benefits of the wiki
way.
So you have the the choice.
-A '''traditional wiki''' allows anyone to edit, without even logging in.
-A wiki with '''account creation required''' provides extra accountability, but
may deter casual contributors.
+A '''{{int:config-profile-wiki}}''' allows anyone to edit, without even
logging in.
+A wiki with '''{{int:config-profile-no-anon}}''' provides extra
accountability, but may deter casual contributors.
-The '''authorized editors only''' scenario allows approved users to edit, but
the public can view the pages, including history.
-A '''private wiki''' only allows approved users to view pages, with the same
group allowed to edit.
+The '''{{int:config-profile-fishbowl}}''' scenario allows approved users to
edit, but the public can view the pages, including history.
+A '''{{int:config-profile-private}}''' only allows approved users to view
pages, with the same group allowed to edit.
More complex user rights configurations are available after installation, see
the [http://www.mediawiki.org/wiki/Manual:User_rights relevant manual entry].",
'config-license' => 'Copyright and license:',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70399] trunk/phase3/languages/messages/MessagesCs.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70399 Revision: 70399 Author: danny_b Date: 2010-08-03 18:45:50 + (Tue, 03 Aug 2010) Log Message: --- * fix changed link in $bookstoreList Modified Paths: -- trunk/phase3/languages/messages/MessagesCs.php Modified: trunk/phase3/languages/messages/MessagesCs.php === --- trunk/phase3/languages/messages/MessagesCs.php 2010-08-03 18:42:14 UTC (rev 70398) +++ trunk/phase3/languages/messages/MessagesCs.php 2010-08-03 18:45:50 UTC (rev 70399) @@ -120,7 +120,7 @@ * Hledání knihy podle ISBN */ $bookstoreList = array( - 'Národní knihovna' => 'http://sigma.nkp.cz/F/?func=find-a&find_code=ISN&request=$1', + 'Národní knihovna' => 'http://aleph.nkp.cz/F/?func=find-a&find_code=ISN&request=$1', 'Státní technická knihovna' => 'http://www.stk.cz/cgi-bin/dflex/CZE/STK/BROWSE?A=01&V=$1', 'inherit' => true, ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70398] trunk/phase3/maintenance/language/StatOutputs.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70398
Revision: 70398
Author: siebrand
Date: 2010-08-03 18:42:14 + (Tue, 03 Aug 2010)
Log Message:
---
Weigh reverse with factor 20 so coloring takes effect more quickly.
Modified Paths:
--
trunk/phase3/maintenance/language/StatOutputs.php
Modified: trunk/phase3/maintenance/language/StatOutputs.php
===
--- trunk/phase3/maintenance/language/StatOutputs.php 2010-08-03 18:39:04 UTC
(rev 70397)
+++ trunk/phase3/maintenance/language/StatOutputs.php 2010-08-03 18:42:14 UTC
(rev 70398)
@@ -52,6 +52,10 @@
function formatPercent( $subset, $total, $revert = false, $accuracy = 2
) {
$v = @round( 255 * $subset / $total );
if ( $revert ) {
+ # Weigh reverse with factor 20 so coloring takes effect
more quickly as
+ # this option is used solely for reporting 'bad'
percentages.
+ $v = $v * 20;
+ if ( $v > 255 ) $v = 255;
$v = 255 - $v;
}
if ( $v < 128 ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70397] trunk/extensions/SidebarDonateBox/SidebarDonateBox.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70397 Revision: 70397 Author: raymond Date: 2010-08-03 18:39:04 + (Tue, 03 Aug 2010) Log Message: --- Follow-up r70334: Fix author name Modified Paths: -- trunk/extensions/SidebarDonateBox/SidebarDonateBox.i18n.php Modified: trunk/extensions/SidebarDonateBox/SidebarDonateBox.i18n.php === --- trunk/extensions/SidebarDonateBox/SidebarDonateBox.i18n.php 2010-08-03 18:37:37 UTC (rev 70396) +++ trunk/extensions/SidebarDonateBox/SidebarDonateBox.i18n.php 2010-08-03 18:39:04 UTC (rev 70397) @@ -7,7 +7,7 @@ $messages = array(); /** English - * @author Tisane + * @author Daniel Friesen */ $messages['en'] = array( 'sidebardonatebox-desc' => 'Adds a custom donate box to the sidebar' ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70395] trunk/extensions/JS2Support/mwEmbed/libraries/jquery/plugins/ jquery.menu/jquery.menu.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70395
Revision: 70395
Author: dale
Date: 2010-08-03 18:35:35 + (Tue, 03 Aug 2010)
Log Message:
---
menu updates for sequencer menu usage to support divider and disabled class
Modified Paths:
--
trunk/extensions/JS2Support/mwEmbed/libraries/jquery/plugins/jquery.menu/jquery.menu.js
Modified:
trunk/extensions/JS2Support/mwEmbed/libraries/jquery/plugins/jquery.menu/jquery.menu.js
===
---
trunk/extensions/JS2Support/mwEmbed/libraries/jquery/plugins/jquery.menu/jquery.menu.js
2010-08-03 18:30:57 UTC (rev 70394)
+++
trunk/extensions/JS2Support/mwEmbed/libraries/jquery/plugins/jquery.menu/jquery.menu.js
2010-08-03 18:35:35 UTC (rev 70395)
@@ -5,11 +5,17 @@
By: Maggie Costello Wachs (mag...@filamentgroup.com) and Scott Jehl
(sc...@filamentgroup.com)
http://www.filamentgroup.com
* reference articles:
http://www.filamentgroup.com/lab/jquery_ipod_style_drilldown_menu/
+
+* modified by Michael Dale, ( michael.d...@kaltura.com )
Copyright (c) 2009 Filament Group
Dual licensed under the MIT (filamentgroup.com/examples/mit-license.txt) and
GPL (filamentgroup.com/examples/gpl-license.txt) licenses.
-NOTE: mvEmbed will switch to jquery ui menu once that is released
+NOTE: mwEmbed will switch to jquery ui menu once that is released
+NOTE: This menu contains several customizations for use in mwEmbed modules::
+
+* added getLineItem helper function
+* added special class "divider" that is non selectable menu item horizontal hr
*/
@@ -120,6 +126,7 @@
linkToFront: false
},
showSpeed: 200, // show/hide speed in milliseconds
+ createMenuCallback: null,
callerOnState: 'ui-state-active', // class to change the
appearance of the link/button when the menu is showing
loadingState: 'ui-state-loading', // class added to the
link/button while the menu is created
linkHover: 'ui-state-hover', // class for menu option hover
state
@@ -173,11 +180,11 @@
this.showMenu = function() {
mw.log('$j.menu:: show menu' );
killAllMenus();
- mw.log('done:: killAllMenus' );
+ mw.log('jquery.menu:: killAllMenus' );
if ( ! menu.menuExists) {
menu.create()
};
- mw.log('done:: menu.create' );
+ mw.log('jquery.menu:: menu.create' );
caller
.addClass('fg-menu-open')
.addClass(options.callerOnState);
@@ -185,7 +192,7 @@
menu.kill();
return false;
});
- mw.log('done:: menu. binding container' );
+ mw.log('jquery.menu:: menu. binding container' );
container.hide().slideDown(options.showSpeed).find('.fg-menu:eq(0)');
menu.menuOpen = true;
@@ -271,7 +278,7 @@
};
break;
};
- });
+ });
};
this.create = function() {
@@ -314,11 +321,16 @@
allLinks.hover(
function() {
var menuitem = $(this);
-
$('.'+options.linkHover).removeClass(options.linkHover).blur().parent().removeAttr('id');
-
$(this).addClass(options.linkHover).focus().parent().attr('id','active-menuitem');
+ var menuli = menuitem.parent();
+ if( !menuli.hasClass('divider') &&
!menuli.hasClass('disabled') ){
+
$('.'+options.linkHover).removeClass(options.linkHover).blur().parent().removeAttr('id');
+
$(this).addClass(options.linkHover).focus().parent().addClass('active-menuitem');
+ }
},
function() {
-
$(this).removeClass(options.linkHover).blur().parent().removeAttr('id');
+ if( !menuitem.hasClass('divider') &&
!menuitem.hasClass('disabled') ){
+
$(this).removeClass(options.linkHover).blur().parent().removeClass('active-menuitem');
+ }
}
[MediaWiki-CVS] SVN: [70394] trunk/extensions/JS2Support/mwEmbed/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70394
Revision: 70394
Author: dale
Date: 2010-08-03 18:30:57 + (Tue, 03 Aug 2010)
Log Message:
---
sync updates from resource loader updates from mwEmbedStandAlone
Modified Paths:
--
trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
Modified: trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
===
--- trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
2010-08-03 18:28:40 UTC (rev 70393)
+++ trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php
2010-08-03 18:30:57 UTC (rev 70394)
@@ -17,7 +17,7 @@
private static $combinedLoadersJs = '';
// Reg Exp that supports extracting classes from loaders
- private static $classReplaceExp =
'/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*\;/siU';
+ private static $classReplaceExp =
'/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*[\;\n]/siU';
// Flag to specify if the javascript resource paths have been loaded.
private static $classesLoaded = false;
@@ -265,11 +265,7 @@
$jClassSet = FormatJson::decode( '{' . $jsvar[1] . '}', true );
// Check for null json decode:
if( $jClassSet == NULL ){
- $moduleName = ( self::$resourceParentModuleName [
$resourceName ] )
- ? self::$resourceParentModuleName [
$resourceName ]
- : ' loader set in extension ';
-
- throw new MWException( "Error could not decode
javascript resource list for module:" . $moduleName ." \n" );
+ throw new MWException( "Error could not decode
javascript resource list for module: " + self::$currentModuleName + "\n" );
return false;
}
Modified: trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
===
--- trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
2010-08-03 18:28:40 UTC (rev 70393)
+++ trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php
2010-08-03 18:30:57 UTC (rev 70394)
@@ -28,7 +28,7 @@
$wgUseFileCache = true;
// Named paths for the script loader
-$wgScriptLoaderNamedPaths = array();
+$wgResourceLoaderNamedPaths = array();
//If the scriptLoader should use relative css
$wgScriptLoaderRelativeCss = false;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70392] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70392
Revision: 70392
Author: nikerabbit
Date: 2010-08-03 17:56:08 + (Tue, 03 Aug 2010)
Log Message:
---
When marking page for translation, purge the completion percentages.
If the stats are not purged, Special:LanguageStats will be stuck displaying
100%. This is bad, since translators use that page to find stuff that needs
updating. Also at 100% it links to task 'review', which does not purge
stats like task 'untranslated' does. Before one would need manual whole cache
purge, or edit one message in that group to purge completion percentage
what that particular language.
Modified Paths:
--
trunk/extensions/Translate/tag/SpecialPageTranslation.php
trunk/extensions/Translate/utils/MemoryCache.php
Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-08-03
17:47:10 UTC (rev 70391)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-08-03
17:56:08 UTC (rev 70392)
@@ -509,9 +509,9 @@
$this->setupRenderJobs( $page );
// Re-generate caches
+ $page->getTranslationPercentages( /*re-generate*/ true );
+ ArrayMemoryCache::factory( 'groupstats' )->clearGroup( 'page|'
. $page->getTitle()->getPrefixedText() );
MessageIndexRebuilder::execute();
- $page->getTranslationPercentages( /*re-generate*/ true );
-
return false;
}
Modified: trunk/extensions/Translate/utils/MemoryCache.php
===
--- trunk/extensions/Translate/utils/MemoryCache.php2010-08-03 17:47:10 UTC
(rev 70391)
+++ trunk/extensions/Translate/utils/MemoryCache.php2010-08-03 17:56:08 UTC
(rev 70392)
@@ -19,6 +19,11 @@
$this->save();
}
+ public function factory( $table ) {
+ // __CLASS__ doesn't work, but this is PHP
+ return new ArrayMemoryCache( $table );
+ }
+
public function get( $group, $code ) {
$this->load();
@@ -51,6 +56,11 @@
}
}
+ public function clearGroup( $group ) {
+ $this->load();
+ unset( $this->cache[$group] );
+ }
+
public function clearAll() {
$this->load();
$this->cache = array();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70391] trunk/phase3/languages/Language.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70391
Revision: 70391
Author: simetrical
Date: 2010-08-03 17:47:10 + (Tue, 03 Aug 2010)
Log Message:
---
Use firstChar() in firstLetterForLists()
This will hopefully avoid regression in non-English languages when this
stub starts being used.
Modified Paths:
--
trunk/phase3/languages/Language.php
Modified: trunk/phase3/languages/Language.php
===
--- trunk/phase3/languages/Language.php 2010-08-03 17:33:09 UTC (rev 70390)
+++ trunk/phase3/languages/Language.php 2010-08-03 17:47:10 UTC (rev 70391)
@@ -2991,6 +2991,6 @@
if ( $string[0] == "\0" ) {
$string = substr( $string, 1 );
}
- return strtoupper( mb_substr( $string, 0, 1 ) );
+ return strtoupper( $this->firstChar( $string ) );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70390] branches/resourceloader/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70390
Revision: 70390
Author: tparscal
Date: 2010-08-03 17:33:09 + (Tue, 03 Aug 2010)
Log Message:
---
Moved server location out of ResourceLoader and into load.php. Now whatever
might want to respond to a resource loader request can do so without
ResourceLoader knowing anything about load.php.
Modified Paths:
--
branches/resourceloader/phase3/includes/ResourceLoader.php
branches/resourceloader/phase3/load.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
17:18:15 UTC (rev 70389)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-08-03
17:33:09 UTC (rev 70390)
@@ -183,7 +183,7 @@
* 'debug' => [boolean: true to include debug-only
scripts, optional, false by default],
* )
*/
- public static function respond( WebRequest $request ) {
+ public static function respond( WebRequest $request, $server ) {
global $wgUser, $wgLang, $wgDefaultSkin;
// Fallback on system settings
$parameters = array(
@@ -234,7 +234,7 @@
*
* Also, the naming of these variables is horrible and
sad, hopefully this can be worked on
*/
- $parameters['server'] = dirname(
$_SERVER['REQUEST_URI'] );
+ $parameters['server'] = $server;
echo "mw.config.set( " . json_encode( $parameters ) . "
);\n";
// Collect all loaders
$loaders = array();
Modified: branches/resourceloader/phase3/load.php
===
--- branches/resourceloader/phase3/load.php 2010-08-03 17:18:15 UTC (rev
70389)
+++ branches/resourceloader/phase3/load.php 2010-08-03 17:33:09 UTC (rev
70390)
@@ -50,7 +50,7 @@
// Include core resource list
require_once "$IP/resources/Resources.php";
// Respond to resource loading request
-ResourceLoader::respond( $wgRequest );
+ResourceLoader::respond( $wgRequest, $wgServer . $wgScriptPath . '/load.php' );
wfProfileOut( 'load.php' );
wfLogProfilingData();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70389] branches/resourceloader/phase3/resources/Resources.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70389 Revision: 70389 Author: tparscal Date: 2010-08-03 17:18:15 + (Tue, 03 Aug 2010) Log Message: --- Updated dependencies based on information at http://jqueryui.com/demos/ Modified Paths: -- branches/resourceloader/phase3/resources/Resources.php Modified: branches/resourceloader/phase3/resources/Resources.php === --- branches/resourceloader/phase3/resources/Resources.php 2010-08-03 17:01:45 UTC (rev 70388) +++ branches/resourceloader/phase3/resources/Resources.php 2010-08-03 17:18:15 UTC (rev 70389) @@ -28,11 +28,11 @@ ), 'jquery.ui.mouse' => array( 'script' => 'resources/jquery/ui/jquery.ui.mouse.js', - 'needs' => array( 'jquery.ui.core' ), + 'needs' => array( 'jquery' ), ), 'jquery.ui.position' => array( 'script' => 'resources/jquery/ui/jquery.ui.position.js', - 'needs' => array( 'jquery.ui.core' ), + 'needs' => array( 'jquery' ), ), // Interactions 'jquery.ui.draggable' => array( @@ -41,7 +41,7 @@ ), 'jquery.ui.droppable' => array( 'script' => 'resources/jquery/ui/jquery.ui.droppable.js', - 'needs' => array( 'jquery.ui.core' ), + 'needs' => array( 'jquery.ui.core', 'jquery.ui.draggable' ), ), 'jquery.ui.resizable' => array( 'script' => 'resources/jquery/ui/jquery.ui.resizable.js', @@ -66,7 +66,7 @@ // Widgets 'jquery.ui.accordion' => array( 'script' => 'resources/jquery/ui/jquery.ui.accordion.js', - 'needs' => array( 'jquery.ui.widget' ), + 'needs' => array( 'jquery.ui.core' ), 'themes' => array( 'default' => 'resources/jquery/ui/themes/default/jquery.ui.accordion.css', 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.accordion.css', @@ -74,7 +74,7 @@ ), 'jquery.ui.autocomplete' => array( 'script' => 'resources/jquery/ui/jquery.ui.autocomplete.js', - 'needs' => array( 'jquery.ui.widget' ), + 'needs' => array( 'jquery.ui.core', 'jquery.ui.widget', 'jquery.ui.position' ), 'themes' => array( 'default' => 'resources/jquery/ui/themes/default/jquery.ui.autocomplete.css', 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.autocomplete.css', @@ -82,39 +82,15 @@ ), 'jquery.ui.button' => array( 'script' => 'resources/jquery/ui/jquery.ui.button.js', - 'needs' => array( 'jquery.ui.widget' ), + 'needs' => array( 'jquery.ui.core', 'jquery.ui.widget' ), 'themes' => array( 'default' => 'resources/jquery/ui/themes/default/jquery.ui.button.css', 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.button.css', ), ), - 'jquery.ui.dialog' => array( - 'script' => 'resources/jquery/ui/jquery.ui.dialog.js', - 'needs' => array( 'jquery.ui.widget' ), - 'themes' => array( - 'default' => 'resources/jquery/ui/themes/default/jquery.ui.dialog.css', - 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.dialog.css', - ), - ), - 'jquery.ui.slider' => array( - 'script' => 'resources/jquery/ui/jquery.ui.slider.js', - 'needs' => array( 'jquery.ui.widget' ), - 'themes' => array( - 'default' => 'resources/jquery/ui/themes/default/jquery.ui.slider.css', - 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.slider.css', - ), - ), - 'jquery.ui.tabs' => array( - 'script' => 'resources/jquery/ui/jquery.ui.tabs.js', - 'needs' => array( 'jquery.ui.widget' ), - 'themes' => array( - 'default' => 'resources/jquery/ui/themes/default/jquery.ui.tabs.css', - 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.tabs.css', - ), - ), 'jquery.ui.datepicker' => array( 'script' => 'resources/jquery/ui/jquery.ui.datepicker.js', - 'needs' => array( 'jquery.ui.widget' ), + 'needs' => array( 'jquery.ui.core' ), 'themes' => array( 'default' => 'resources/jquery/ui/themes/default/jquery.ui.datepicker.css', 'vector' => 'resources/jquery/ui/themes/vector/jquery.ui.datepicker.css', @@ -174,14 +150,38 @@ 'zh-tw' => 'resources/jquery/ui/i18n/jquery.ui.datepicker-zh-TW.js
[MediaWiki-CVS] SVN: [70388] branches/resourceloader/phase3/resources/mediawiki/mediawiki. log.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70388
Revision: 70388
Author: tparscal
Date: 2010-08-03 17:01:45 + (Tue, 03 Aug 2010)
Log Message:
---
Fixed copy-paste mistake in comment block
Modified Paths:
--
branches/resourceloader/phase3/resources/mediawiki/mediawiki.log.js
Modified: branches/resourceloader/phase3/resources/mediawiki/mediawiki.log.js
===
--- branches/resourceloader/phase3/resources/mediawiki/mediawiki.log.js
2010-08-03 15:55:11 UTC (rev 70387)
+++ branches/resourceloader/phase3/resources/mediawiki/mediawiki.log.js
2010-08-03 17:01:45 UTC (rev 70388)
@@ -1,5 +1,5 @@
/*
- * User-agent detection
+ * Debug output logging
*/
( function( $, mw ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70387] branches/wmf/1.16wmf4/languages/messages/MessagesEo.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70387 Revision: 70387 Author: catrope Date: 2010-08-03 15:55:11 + (Tue, 03 Aug 2010) Log Message: --- 1.16wmf4: MFT r70350 Modified Paths: -- branches/wmf/1.16wmf4/languages/messages/MessagesEo.php Modified: branches/wmf/1.16wmf4/languages/messages/MessagesEo.php === --- branches/wmf/1.16wmf4/languages/messages/MessagesEo.php 2010-08-03 14:59:06 UTC (rev 70386) +++ branches/wmf/1.16wmf4/languages/messages/MessagesEo.php 2010-08-03 15:55:11 UTC (rev 70387) @@ -29,8 +29,8 @@ NS_MEDIA=> 'Aŭdvidaĵo', NS_SPECIAL => 'Speciala', NS_TALK => 'Diskuto', - NS_USER => 'Vikipediisto', - NS_USER_TALK=> 'Vikipediista_diskuto', + NS_USER => 'Uzanto', + NS_USER_TALK=> 'Uzanta_diskuto', NS_PROJECT_TALK => '$1_diskuto', NS_FILE => 'Dosiero', NS_FILE_TALK=> 'Dosiera_diskuto', @@ -44,6 +44,11 @@ NS_CATEGORY_TALK=> 'Kategoria_diskuto', ); +$namespaceAliases = array( + 'Vikipediisto' => NS_USER, + 'Vikipediista_diskuto' => NS_USER_TALK, +); + $specialPageAliases = array( 'DoubleRedirects' => array( 'Duoblaj alidirektiloj' ), 'BrokenRedirects' => array( 'Rompitaj alidirektiloj' ), ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70386] trunk/extensions/Translate/tag/RenderJob.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70386 Revision: 70386 Author: nikerabbit Date: 2010-08-03 14:59:06 + (Tue, 03 Aug 2010) Log Message: --- Tweak debugging to be more useful Modified Paths: -- trunk/extensions/Translate/tag/RenderJob.php Modified: trunk/extensions/Translate/tag/RenderJob.php === --- trunk/extensions/Translate/tag/RenderJob.php2010-08-03 14:16:10 UTC (rev 70385) +++ trunk/extensions/Translate/tag/RenderJob.php2010-08-03 14:59:06 UTC (rev 70386) @@ -62,8 +62,8 @@ $wgUser = $user; // Do the edit - $article->doEdit( $text, $summary, $flags ); - SpecialPageTranslation::superDebug( __METHOD__, 'edit', $user, $title, $flags ); + $status = $article->doEdit( $text, $summary, $flags ); + SpecialPageTranslation::superDebug( __METHOD__, 'edit', $user, $title, $flags, $status ); // User hack $wgUser = $oldUser; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70385] trunk/phase3/maintenance/language/rebuildLanguage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70385
Revision: 70385
Author: platonides
Date: 2010-08-03 14:16:10 + (Tue, 03 Aug 2010)
Log Message:
---
Change from global to parameter.
Modified Paths:
--
trunk/phase3/maintenance/language/rebuildLanguage.php
Modified: trunk/phase3/maintenance/language/rebuildLanguage.php
===
--- trunk/phase3/maintenance/language/rebuildLanguage.php 2010-08-03
13:25:10 UTC (rev 70384)
+++ trunk/phase3/maintenance/language/rebuildLanguage.php 2010-08-03
14:16:10 UTC (rev 70385)
@@ -21,9 +21,8 @@
* @param $removeDupes Remove the duplicated messages?
* @param $dupeMsgSource The source file intended to remove from the array.
*/
-function rebuildLanguage( $code, $write, $listUnknown, $removeUnknown,
$removeDupes, $dupeMsgSource ) {
- global $wgLanguages;
- $messages = $wgLanguages->getMessages( $code );
+function rebuildLanguage( $languages, $code, $write, $listUnknown,
$removeUnknown, $removeDupes, $dupeMsgSource ) {
+ $messages = $languages->getMessages( $code );
$messages = $messages['all'];
if ( $removeDupes ) {
$messages = removeDupes( $messages, $dupeMsgSource );
@@ -96,13 +95,13 @@
$wgRemoveDuplicateMessages = isset( $options['remove-duplicates'] );
# Get language objects
-$wgLanguages = new languages();
+$languages = new languages();
# Write all the language
if ( $wgCode == 'all' ) {
- foreach ( $wgLanguages->getLanguages() as $language ) {
- rebuildLanguage( $language, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
+ foreach ( $languages->getLanguages() as $languageCode ) {
+ rebuildLanguage( $languages, $languageCode, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
}
} else {
- rebuildLanguage( $wgCode, $wgWriteToFile, $wgListUnknownMessages,
$wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
+ rebuildLanguage( $languages, $wgCode, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70384] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70384 Revision: 70384 Author: siebrand Date: 2010-08-03 13:25:10 + (Tue, 03 Aug 2010) Log Message: --- Drop support for deleted SendToAFriend Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-08-03 13:23:31 UTC (rev 70383) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2010-08-03 13:25:10 UTC (rev 70384) @@ -130,9 +130,6 @@ Search -Send To A Friend -aliasfile = SendToAFriend/SendToAFriend.alias.php - Shared Help Share Feature ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70383] trunk/phase3/includes/WebRequest.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70383
Revision: 70383
Author: platonides
Date: 2010-08-03 13:23:31 + (Tue, 03 Aug 2010)
Log Message:
---
Follow up r70356.
Improve WebRequest getAcceptLang(): Add support for q=0 language and the
special range "*", always return the language codes in lowercase.
Modified Paths:
--
trunk/phase3/includes/WebRequest.php
Modified: trunk/phase3/includes/WebRequest.php
===
--- trunk/phase3/includes/WebRequest.php2010-08-03 07:36:51 UTC (rev
70382)
+++ trunk/phase3/includes/WebRequest.php2010-08-03 13:23:31 UTC (rev
70383)
@@ -730,6 +730,8 @@
/**
* Parse the Accept-Language header sent by the client into an array
* @return array( languageCode => q-value ) sorted by q-value in
descending order
+* May contain the "language" '*', which applies to languages other
than those explicitly listed.
+* This is aligned with rfc2616 section 14.4
*/
public function getAcceptLang() {
// Modified version of code found at
http://www.thefutureoftheweb.com/blog/use-accept-language-header
@@ -738,22 +740,29 @@
return array();
}
+ // Return the language codes in lower case
+ $acceptLang = strtolower( $acceptLang );
+
// 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',
+ preg_match_all(
'/([a-z]{1,8}(-[a-z]{1,8})?|\*)\s*(;\s*q\s*=\s*(1|0(\.[0-9]+)?)?)?/',
$acceptLang, $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;
+ } else if ( $val == 0 ) {
+ unset($langs[$lang]);
}
}
+
// Sort list
arsort( $langs, SORT_NUMERIC );
return $langs;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [70382] trunk/extensions/Translate/groups/Commonist/README
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70382 Revision: 70382 Author: siebrand Date: 2010-08-03 07:36:51 + (Tue, 03 Aug 2010) Log Message: --- Fix checkout command and update comment. Modified Paths: -- trunk/extensions/Translate/groups/Commonist/README Modified: trunk/extensions/Translate/groups/Commonist/README === --- trunk/extensions/Translate/groups/Commonist/README 2010-08-03 06:15:27 UTC (rev 70381) +++ trunk/extensions/Translate/groups/Commonist/README 2010-08-03 07:36:51 UTC (rev 70382) @@ -1,6 +1,6 @@ -Check out read-only copy: +Check out read-only copy of the folder containing the L10n files: cd $HOME/projects/ -svn co svn co http://svn.wikimedia.org/svnroot/mediawiki/trunk/tools/commonist/etc commonist +svn co http://svn.wikimedia.org/svnroot/mediawiki/trunk/tools/commonist/etc commonist To export: php export.php --target=$HOME/export --group=out-commonist --lang=* ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
