[MediaWiki-CVS] SVN: [62695] trunk/extensions/ParserFunctions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62695
Revision: 62695
Author: tstarling
Date: 2010-02-19 07:32:11 + (Fri, 19 Feb 2010)
Log Message:
---
Revert r62436 and associated parser test. If you really want to make
{{#ifexist:foo}} work the same way as [[File:foo]], which is presumably what
bug 14779 is getting at, then you should do a proper job of it, and not
introduce your own special #ifexist-specific syntax for specifying files.
Modified Paths:
--
trunk/extensions/ParserFunctions/ParserFunctions_body.php
trunk/extensions/ParserFunctions/funcsParserTests.txt
Modified: trunk/extensions/ParserFunctions/ParserFunctions_body.php
===
--- trunk/extensions/ParserFunctions/ParserFunctions_body.php 2010-02-19
05:54:09 UTC (rev 62694)
+++ trunk/extensions/ParserFunctions/ParserFunctions_body.php 2010-02-19
07:32:11 UTC (rev 62695)
@@ -321,9 +321,6 @@
function ifexistCommon( &$parser, $frame, $titletext = '', $then = '',
$else = '' ) {
global $wgContLang;
$title = Title::newFromText( $titletext );
- if( is_null( $title ) ) # It may be urlencoded (bug 14779)
- $title = Title::newFromURL( urldecode( $titletext ) );
-
$wgContLang->findVariantLink( $titletext, $title, true );
if ( $title ) {
if( $title->getNamespace() == NS_MEDIA ) {
Modified: trunk/extensions/ParserFunctions/funcsParserTests.txt
===
--- trunk/extensions/ParserFunctions/funcsParserTests.txt 2010-02-19
05:54:09 UTC (rev 62694)
+++ trunk/extensions/ParserFunctions/funcsParserTests.txt 2010-02-19
07:32:11 UTC (rev 62695)
@@ -82,24 +82,6 @@
!! end
!! test
-Bug 14779 - {{#ifexist}} does not recognise URL encoded filenames
-Based on http://test.wikipedia.org/wiki/User:Raymond/ifexist
-!! input
-{{#ifexist:Media:F%6fobar.jpg|found|not found}}
-[[:File:Dionysos-Brunnen am Kölner Dom.jpg]]
-{{#ifexist:File:Dionysos-Brunnen am Kölner Dom.jpg|found|not found}}
-[[:File:Dionysos-Brunnen_am_K%C3%B6lner_Dom.jpg]]
-{{#ifexist:File:Dionysos-Brunnen_am_K%C3%B6lner_Dom.jpg|found|not found}}
-!! result
-found
-File:Dionysos-Brunnen am Kölner
Dom.jpg
-found
-File:Dionysos-Brunnen_am_Kölner_Dom.jpg
-found
-
-!! end
-
-!! test
#if
!! input
{{#if: | yes | no}}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62693] branches/conrad/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62693
Revision: 62693
Author: tstarling
Date: 2010-02-19 05:29:39 + (Fri, 19 Feb 2010)
Log Message:
---
Local changes, by reverse-merging r62689.
Modified Paths:
--
branches/conrad/phase3/RELEASE-NOTES
branches/conrad/phase3/includes/EditPage.php
branches/conrad/phase3/includes/Linker.php
branches/conrad/phase3/includes/MagicWord.php
branches/conrad/phase3/includes/parser/CoreParserFunctions.php
branches/conrad/phase3/includes/parser/Parser.php
branches/conrad/phase3/languages/messages/MessagesEn.php
branches/conrad/phase3/maintenance/parserTests.txt
Modified: branches/conrad/phase3/RELEASE-NOTES
===
--- branches/conrad/phase3/RELEASE-NOTES2010-02-19 05:24:27 UTC (rev
62692)
+++ branches/conrad/phase3/RELEASE-NOTES2010-02-19 05:29:39 UTC (rev
62693)
@@ -321,6 +321,12 @@
maintenance/tests/.
* importImages.php maintenance script can now use the original uploader and
comment from another wiki.
+* (bug 845) [[#foo|]], [[/bar|]] should be equivalent to [[#foo|foo]],
+ [[/bar|bar]] (new use of "pipe trick")
+* (bug 21660) Support full-width commas for pipe trick
+* (bug 7264) Magic word to give Page Title as if pipe-trick performed on it
+ {{pipetrick:}}
+* (bug 20339) Allow using the pipe trick in log reasons
* Support for Turck MMCache was removed
=== Bug fixes in 1.16 ===
@@ -750,6 +756,10 @@
as it appears in extensions as was the case before r30117 where it
was unintentionally sorted along with other fields.
* (bug 19334) Textarea no longer jumps when editing longer articles in IE8
+* (bug 5210) preload parser should parse (as well as
)
+* (bug 8785) Pipe trick should work with colon functions
+* (bug 4099) Pipe trick doesn't work when emptiness is only provided by empty
+ template parameter
* Truncate summary of page moves in revision comment field to avoid broken
multibyte characters
* (bug 22540) ForeignApiRepos no longer try to store thumbnails that don't
exist
Modified: branches/conrad/phase3/includes/EditPage.php
===
--- branches/conrad/phase3/includes/EditPage.php2010-02-19 05:24:27 UTC
(rev 62692)
+++ branches/conrad/phase3/includes/EditPage.php2010-02-19 05:29:39 UTC
(rev 62693)
@@ -227,22 +227,13 @@
* @return string The contents of the page.
*/
protected function getPreloadedText( $preload ) {
+ global $wgParser, $wgUser;
if ( !empty( $this->mPreloadText ) ) {
return $this->mPreloadText;
- } elseif ( $preload === '' ) {
- return '';
} else {
$preloadTitle = Title::newFromText( $preload );
if ( isset( $preloadTitle ) &&
$preloadTitle->userCanRead() ) {
- $rev = Revision::newFromTitle( $preloadTitle );
- if ( is_object( $rev ) ) {
- $text = $rev->getText();
- // TODO FIXME: AAA, this
shouldn't be implementing
- // its own mini-parser! -ævar
- $text = preg_replace(
'~~', '', $text );
- return $text;
- } else
- return '';
+ return $wgParser->getTransclusionText(
$preloadTitle, ParserOptions::newFromUser( $wgUser ) );
}
}
}
Modified: branches/conrad/phase3/includes/Linker.php
===
--- branches/conrad/phase3/includes/Linker.php 2010-02-19 05:24:27 UTC (rev
62692)
+++ branches/conrad/phase3/includes/Linker.php 2010-02-19 05:29:39 UTC (rev
62693)
@@ -1086,6 +1086,11 @@
# Handle link renaming [[foo|text]] will show link as "text"
if( $match[3] != "" ) {
$text = $match[3];
+ if( $match[1] === "" && $this->commentContextTitle ) {
+ $match[1] = Linker::getPipeTrickLink( $text,
$this->commentContextTitle );
+ }
+ } elseif( $match[2] == "|" ) {
+ $text = Linker::getPipeTrickText( $match[1] );
} else {
$text = $match[1];
}
@@ -1206,6 +1211,79 @@
}
/**
+* Returns valid title characters and namespace characters for pipe
trick.
+*
+* FIXME: the namespace characters should not be specified like this...
+*/
+ static function getPipeTrickCharacterClasses() {
+ global $wgLega
[MediaWiki-CVS] SVN: [62692] branches/conrad/phase3/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62692 Revision: 62692 Author: tstarling Date: 2010-02-19 05:24:27 + (Fri, 19 Feb 2010) Log Message: --- Branch for parser work Added Paths: --- branches/conrad/phase3/ Property changes on: branches/conrad/phase3 ___ Added: svn:ignore + *~ .classpath .metadata* .project .settings AdminSettings.php LocalSettings.php StartProfiler.php favicon.ico project.index static* Added: svn:mergeinfo + /branches/REL1_15/phase3:51646 /branches/sqlite:58211-58321 ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62691] branches/conrad/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62691 Revision: 62691 Author: tstarling Date: 2010-02-19 05:23:43 + (Fri, 19 Feb 2010) Log Message: --- Branch for parser work Added Paths: --- branches/conrad/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62690] trunk/extensions/geoserver/geoserver.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62690
Revision: 62690
Author: tstarling
Date: 2010-02-19 05:21:30 + (Fri, 19 Feb 2010)
Log Message:
---
Reverted the extension part of r62416, core part was reverted in r62689.
Modified Paths:
--
trunk/extensions/geoserver/geoserver.php
Modified: trunk/extensions/geoserver/geoserver.php
===
--- trunk/extensions/geoserver/geoserver.php2010-02-19 05:19:32 UTC (rev
62689)
+++ trunk/extensions/geoserver/geoserver.php2010-02-19 05:21:30 UTC (rev
62690)
@@ -20,7 +20,7 @@
*/
function wfGeoServerExtension () {
global $wgParser, $wgHooks ;
- $wgParser->setHook ( 'geo' , 'parseGeo' ) ;
+$wgParser->setTransparentTagHook ( 'geo' , 'parseGeo' ) ;
#$wgHooks['ArticleSaveComplete'][] = 'articleDeleteGeo';
$wgHooks['ArticleDelete'][] = 'articleDeleteGeo';
$wgHooks['ArticleEditUpdatesDeleteFromRecentchanges'][] =
'articleSaveGeo';
@@ -36,11 +36,8 @@
*
* Return markup, but also a pointer to Map sources
*/
-function parseGeo ( $text, $params, &$parser, &$frame ) {
+function parseGeo ( $text, $params, &$parser ) {
global $action, $GeoserverParameters, $wgWikiMapsJS;
-
- $text = $parser->recursiveTagParse( $text, $frame );
-
$latpat= '(-?[0-9.]*) *(([0-9.]+) *([0-9.]+)?)? *([NS])';
$lonpat= '(-?[0-9.]*) *(([0-9.]+) *([0-9.]+)?)? *([EW])';
$featcodepat = '(([AHLPRSTUV])\.([A-Z.]*))?';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62689] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62689
Revision: 62689
Author: tstarling
Date: 2010-02-19 05:19:32 + (Fri, 19 Feb 2010)
Log Message:
---
Moving Conrad's recent parser work out to a branch. Reverted r62434, r62416,
r62150, r62111, r62085, r62081, r62080, r62077, r62076, r62069, r62049, r62035.
Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/EditPage.php
trunk/phase3/includes/Linker.php
trunk/phase3/includes/MagicWord.php
trunk/phase3/includes/parser/CoreParserFunctions.php
trunk/phase3/includes/parser/Parser.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/parserTests.txt
Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES 2010-02-19 04:56:09 UTC (rev 62688)
+++ trunk/phase3/RELEASE-NOTES 2010-02-19 05:19:32 UTC (rev 62689)
@@ -321,12 +321,6 @@
maintenance/tests/.
* importImages.php maintenance script can now use the original uploader and
comment from another wiki.
-* (bug 845) [[#foo|]], [[/bar|]] should be equivalent to [[#foo|foo]],
- [[/bar|bar]] (new use of "pipe trick")
-* (bug 21660) Support full-width commas for pipe trick
-* (bug 7264) Magic word to give Page Title as if pipe-trick performed on it
- {{pipetrick:}}
-* (bug 20339) Allow using the pipe trick in log reasons
* Support for Turck MMCache was removed
=== Bug fixes in 1.16 ===
@@ -756,10 +750,6 @@
as it appears in extensions as was the case before r30117 where it
was unintentionally sorted along with other fields.
* (bug 19334) Textarea no longer jumps when editing longer articles in IE8
-* (bug 5210) preload parser should parse (as well as
)
-* (bug 8785) Pipe trick should work with colon functions
-* (bug 4099) Pipe trick doesn't work when emptiness is only provided by empty
- template parameter
* Truncate summary of page moves in revision comment field to avoid broken
multibyte characters
* (bug 22540) ForeignApiRepos no longer try to store thumbnails that don't
exist
Modified: trunk/phase3/includes/EditPage.php
===
--- trunk/phase3/includes/EditPage.php 2010-02-19 04:56:09 UTC (rev 62688)
+++ trunk/phase3/includes/EditPage.php 2010-02-19 05:19:32 UTC (rev 62689)
@@ -227,13 +227,22 @@
* @return string The contents of the page.
*/
protected function getPreloadedText( $preload ) {
- global $wgParser, $wgUser;
if ( !empty( $this->mPreloadText ) ) {
return $this->mPreloadText;
+ } elseif ( $preload === '' ) {
+ return '';
} else {
$preloadTitle = Title::newFromText( $preload );
if ( isset( $preloadTitle ) &&
$preloadTitle->userCanRead() ) {
- return $wgParser->getTransclusionText(
$preloadTitle, ParserOptions::newFromUser( $wgUser ) );
+ $rev = Revision::newFromTitle( $preloadTitle );
+ if ( is_object( $rev ) ) {
+ $text = $rev->getText();
+ // TODO FIXME: AAA, this
shouldn't be implementing
+ // its own mini-parser! -ævar
+ $text = preg_replace(
'~~', '', $text );
+ return $text;
+ } else
+ return '';
}
}
}
Modified: trunk/phase3/includes/Linker.php
===
--- trunk/phase3/includes/Linker.php2010-02-19 04:56:09 UTC (rev 62688)
+++ trunk/phase3/includes/Linker.php2010-02-19 05:19:32 UTC (rev 62689)
@@ -1086,11 +1086,6 @@
# Handle link renaming [[foo|text]] will show link as "text"
if( $match[3] != "" ) {
$text = $match[3];
- if( $match[1] === "" && $this->commentContextTitle ) {
- $match[1] = Linker::getPipeTrickLink( $text,
$this->commentContextTitle );
- }
- } elseif( $match[2] == "|" ) {
- $text = Linker::getPipeTrickText( $match[1] );
} else {
$text = $match[1];
}
@@ -1211,79 +1206,6 @@
}
/**
-* Returns valid title characters and namespace characters for pipe
trick.
-*
-* FIXME: the namespace characters should not be specified like this...
-*/
- static function getPipeTrickCharacterClasses() {
- global $wgLegalTitleChars;
- return array( "[$wgLegalTitleChars]", '[
_0-9A-Za
[MediaWiki-CVS] SVN: [62688] trunk/phase3/maintenance/storage/fixBug20757.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62688
Revision: 62688
Author: tstarling
Date: 2010-02-19 04:56:09 + (Fri, 19 Feb 2010)
Log Message:
---
Resolve stubs which may be broken by running RCT. Added a --start option. Not
tested yet.
Modified Paths:
--
trunk/phase3/maintenance/storage/fixBug20757.php
Modified: trunk/phase3/maintenance/storage/fixBug20757.php
===
--- trunk/phase3/maintenance/storage/fixBug20757.php2010-02-19 03:07:28 UTC
(rev 62687)
+++ trunk/phase3/maintenance/storage/fixBug20757.php2010-02-19 04:56:09 UTC
(rev 62688)
@@ -12,6 +12,7 @@
parent::__construct();
$this->mDescription = 'Script to fix bug 20757 assuming that
blob_tracking is intact';
$this->addOption( 'dry-run', 'Report only' );
+ $this->addOption( 'start', 'old_id to start at', false, true );
}
function execute() {
@@ -23,7 +24,7 @@
print "Dry run only.\n";
}
- $startId = 0;
+ $startId = $this->getOption( 'start', 0 );
$numGood = 0;
$numFixed = 0;
$numBad = 0;
@@ -38,7 +39,7 @@
array( 'old_id', 'old_flags', 'old_text' ),
array(
'old_id > ' . intval( $startId ),
- 'old_flags' => 'object'
+ 'old_flags ' . $dbr->buildLike(
$dbr->anyString(), 'object', $dbr->anyString )
),
__METHOD__,
array(
@@ -72,14 +73,6 @@
continue;
}
- // Check if it really is broken
- $text = Revision::getRevisionText( $row );
- if ( $text !== false ) {
- // Not broken yet
- ++$numGood;
- continue;
- }
-
if ( strtolower( get_class( $obj ) ) !==
'historyblobstub' ) {
print "{$row->old_id}: unrecoverable:
unexpected object class " .
get_class( $obj ) . "\n";
@@ -122,6 +115,7 @@
foreach ( $stubs as $primaryId => $stub ) {
$secondaryId = $stub['secondaryId'];
if ( !isset( $trackedBlobs[$secondaryId] ) ) {
+ // No tracked blob. Work out what went
wrong
$secondaryRow = $dbr->selectRow(
'text',
array( 'old_flags', 'old_text'
),
@@ -130,12 +124,18 @@
);
if ( !$secondaryRow ) {
print "$primaryId:
unrecoverable: secondary row is missing\n";
+ ++$numBad;
+ } elseif ( $this->isUnbrokenStub(
$stub, $secondaryRow ) ) {
+ // Not broken yet, and not in
the tracked clusters so it won't get
+ // broken by the current RCT
run.
+ ++$numGood;
} elseif ( strpos(
$secondaryRow->old_flags, 'external' ) !== false ) {
print "$primaryId:
unrecoverable: secondary gone to {$secondaryRow->old_text}\n";
+ ++$numBad;
} else {
print "$primaryId:
unrecoverable: miscellaneous corruption of secondary row\n";
+ ++$numBad;
}
- ++$numBad;
unset( $stubs[$primaryId] );
continue;
}
@@ -212,7 +212,7 @@
print "\n";
print "Fixed: $numFixed\n";
print "Unrecoverable: $numBad\n";
- print "Not yet broken: $numGood\n";
+ print "Good stubs: $numGood\n";
}
function waitForSlaves() {
@@ -258,6 +258,43 @@
return $this->mapCache[$pageId];
}
+ /**
+* This is based on part of HistoryBlobStub::getText().
[MediaWiki-CVS] SVN: [62687] branches/parser-work/phase3/includes/parser
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62687
Revision: 62687
Author: than4213
Date: 2010-02-19 03:07:28 + (Fri, 19 Feb 2010)
Log Message:
---
Created Parser quantifiers (ParseQuant) These will be used more in the future
Modified Paths:
--
branches/parser-work/phase3/includes/parser/ParseTree.php
branches/parser-work/phase3/includes/parser/Preprocessor_DOM.php
Modified: branches/parser-work/phase3/includes/parser/ParseTree.php
===
--- branches/parser-work/phase3/includes/parser/ParseTree.php 2010-02-19
01:25:57 UTC (rev 62686)
+++ branches/parser-work/phase3/includes/parser/ParseTree.php 2010-02-19
03:07:28 UTC (rev 62687)
@@ -6,7 +6,7 @@
*/
interface ParseObject {
// Does the parse task specific to each parse object
- function parse(&$text, &$rules);
+ function parse(&$text, &$rules, $endTag = NULL);
}
/**
@@ -15,7 +15,7 @@
* mName - The name to give the resultant ParseTree object
* mBeginTag - the regular expression used to determine if this is the rule
that should be used
* mEndTag - If ParseTrees of this type are to have children, mEndTag
specifies when all of the children are collected
- * mChildRule - an extra rule to consider when collecting children, it is only
used for situations covered by the HHP21 parser test
+ * mChildRule - What Parse rule to use to gather children for this element
* @ingroup Parser
*/
class ParseRule implements ParseObject {
@@ -28,26 +28,23 @@
$this->mChildRule = $childRule;
}
- function parse(&$text, &$rules) {
+ function parse(&$text, &$rules, $endTag = NULL) {
if (! preg_match($this->mBeginTag, $text, $matches)) {
return NULL;
}
$newText = substr($text, strlen($matches[0]));
- $children = array();
- if ($this->mChildRule != NULL && $this->mEndTag != NULL) {
+ $children = NULL;
+ if ($this->mChildRule != NULL) {
$endTag = $this->mEndTag;
- foreach ($matches as $i => $crrnt) {
- $endTag = str_replace('~' . $i, $crrnt,
$endTag);
- }
- while (! preg_match($endTag, $newText, $endMatches)) {
- $child =
$rules[$this->mChildRule]->parse($newText, $rules);
- if ($child == NULL) {
- return NULL;
+ if ($endTag != NULL) {
+ foreach ($matches as $i => $crrnt) {
+ $endTag = str_replace('~' . $i, $crrnt,
$endTag);
}
- $children[] = $child;
}
- $newText = substr($newText, strlen($endMatches[0]));
- $matches = array_merge($matches, $endMatches);
+ $children = $rules[$this->mChildRule]->parse($newText,
$rules, $endTag);
+ if ($children == NULL) {
+ return NULL;
+ }
}
$text = $newText;
return new ParseTree($this->mName, $matches, $children);
@@ -55,6 +52,47 @@
}
/**
+ * A rule specifying how to parse the text.
+ * If the text matches mBeginTag then a ParseTree object is created with the
appropriate info.
+ * mName - The name to give the resultant ParseTree object
+ * mChildRule - What Parse rule to use to gather children for this element
+ * mEndTag - If ParseTrees of this type are to have children, mEndTag
specifies when all of the children are collected
+ * mMinChildren - Minimum amount of children for this rule
+ * mMaxChildren - Maximum amount of children for this rule, 0 means unlimited
+ * @ingroup Parser
+ */
+class ParseQuant implements ParseObject {
+ private $mName, $mChildRule, $mEndTag, $mMinChildren, $mMaxChildren;
+
+ function __construct($name, $childRule, $endTag = NULL, $minChildren =
0, $maxChildren = 0) {
+ $this->mName = $name;
+ $this->mChildRule = $childRule;
+ $this->mEndTag = $endTag;
+ $this->mMinChildren = $minChildren;
+ $this->mMaxChildren = $maxChildren;
+ }
+
+ function parse(&$text, &$rules, $endTag = NULL) {
+ $children = array();
+ for ($i = 0; $i < $minChildren || (($this->mEndTag == NULL || !
preg_match($this->mEndTag, $text, $matches)) &&
+ ($endTag == NULL || ! preg_match($endTag, $text,
$matches)) && ($maxChildren <= 0 || $i < $maxChildren)); $i ++) {
+ $child = $rules[$this->mChildRule]->parse($text,
$rules, $endTag);
+ if ($child == NULL) {
+
[MediaWiki-CVS] SVN: [62686] trunk/phase3/includes/api
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62686
Revision: 62686
Author: reedy
Date: 2010-02-19 01:25:57 + (Fri, 19 Feb 2010)
Log Message:
---
Stylize on Api
Manual layout improvements in ApiFeedWatchlist
Modified Paths:
--
trunk/phase3/includes/api/ApiDelete.php
trunk/phase3/includes/api/ApiFeedWatchlist.php
trunk/phase3/includes/api/ApiMain.php
trunk/phase3/includes/api/ApiUserrights.php
Modified: trunk/phase3/includes/api/ApiDelete.php
===
--- trunk/phase3/includes/api/ApiDelete.php 2010-02-19 00:49:05 UTC (rev
62685)
+++ trunk/phase3/includes/api/ApiDelete.php 2010-02-19 01:25:57 UTC (rev
62686)
@@ -79,7 +79,7 @@
if ( count( $retval ) )
$this->dieUsageMsg( reset( $retval ) ); // We
don't care about multiple errors, just report one of them
-
+
if ( $params['watch'] || $wgUser->getOption(
'watchdeletion' ) )
$articleObj->doWatch();
else if ( $params['unwatch'] )
Modified: trunk/phase3/includes/api/ApiFeedWatchlist.php
===
--- trunk/phase3/includes/api/ApiFeedWatchlist.php 2010-02-19 00:49:05 UTC
(rev 62685)
+++ trunk/phase3/includes/api/ApiFeedWatchlist.php 2010-02-19 01:25:57 UTC
(rev 62686)
@@ -75,13 +75,17 @@
'wllimit' => ( 50 > $wgFeedLimit ) ?
$wgFeedLimit : 50
);
- if ( !is_null( $params['wlowner'] ) )
+ if ( !is_null( $params['wlowner'] ) ) {
$fauxReqArr['wlowner'] = $params['wlowner'];
- if ( !is_null( $params['wltoken'] ) )
+ }
+ if ( !is_null( $params['wltoken'] ) ) {
$fauxReqArr['wltoken'] = $params['wltoken'];
+ }
// Check for 'allrev' parameter, and if found, show all
revisions to each page on wl.
- if ( ! is_null ( $params['allrev'] ) )
$fauxReqArr['wlallrev'] = '';
+ if ( !is_null ( $params['allrev'] ) ) {
+ $fauxReqArr['wlallrev'] = '';
+ }
// Create the request
$fauxReq = new FauxRequest ( $fauxReqArr );
@@ -93,7 +97,7 @@
// Get data array
$data = $module->getResultData();
- $feedItems = array ();
+ $feedItems = array();
foreach ( (array)$data['query']['watchlist'] as $info )
{
$feedItems[] = $this->createFeedItem( $info );
}
Modified: trunk/phase3/includes/api/ApiMain.php
===
--- trunk/phase3/includes/api/ApiMain.php 2010-02-19 00:49:05 UTC (rev
62685)
+++ trunk/phase3/includes/api/ApiMain.php 2010-02-19 01:25:57 UTC (rev
62686)
@@ -414,7 +414,7 @@
$moduleParams = $module->extractRequestParams();
- //Die if token required, but not provided (unless there is a
gettoken parameter)
+ // Die if token required, but not provided (unless there is a
gettoken parameter)
$salt = $module->getTokenSalt();
if ( $salt !== false )
{
Modified: trunk/phase3/includes/api/ApiUserrights.php
===
--- trunk/phase3/includes/api/ApiUserrights.php 2010-02-19 00:49:05 UTC (rev
62685)
+++ trunk/phase3/includes/api/ApiUserrights.php 2010-02-19 01:25:57 UTC (rev
62686)
@@ -39,7 +39,7 @@
public function execute() {
$params = $this->extractRequestParams();
- //User already validated in call to getTokenSalt from Main
+ // User already validated in call to getTokenSalt from Main
$form = new UserrightsPage;
$user = $form->fetchUser( $params['user'] );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62685] trunk/extensions/UsabilityInitiative
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62685
Revision: 62685
Author: adam
Date: 2010-02-19 00:49:05 + (Fri, 19 Feb 2010)
Log Message:
---
WikiEditor - adding a ctrl+y handler for REDO in IE
Modified Paths:
--
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-19 00:48:59 UTC (rev 62684)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-02-19 00:49:05 UTC (rev 62685)
@@ -72,7 +72,7 @@
array( 'src' =>
'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ),
array( 'src' =>
'js/plugins/jquery.suggestions.js', 'version' => 7 ),
array( 'src' =>
'js/plugins/jquery.textSelection.js', 'version' => 27 ),
- array( 'src' =>
'js/plugins/jquery.wikiEditor.js', 'version' => 142 ),
+ array( 'src' =>
'js/plugins/jquery.wikiEditor.js', 'version' => 143 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 33 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 49 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 17 ),
@@ -82,10 +82,10 @@
array( 'src' =>
'js/plugins/jquery.wikiEditor.publish.js', 'version' => 3 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 268 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 269 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 268 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 269 ),
),
),
);
Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
===
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
2010-02-19 00:48:59 UTC (rev 62684)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
2010-02-19 00:49:05 UTC (rev 62685)
@@ -306,7 +306,6 @@
* processing of events which did not actually change the
content of the iframe.
*/
'keydown': function( event ) {
-
switch ( event.which ) {
case 90: // z
if ( ( event.ctrlKey || event.metaKey )
&& context.history.length ) {
@@ -343,6 +342,32 @@
return false;
}
break;
+ case 89: //y
+ // ctrl + y handler for IE
+ if ( ( event.ctrlKey || event.metaKey )
&& context.history.length && $.browser.msie ) {
+ newPosition =
context.historyPosition + 1;
+ // Only act if we are switching
to a valid state
+ if ( newPosition >= (
context.history.length * -1 ) && newPosition < 0 ) {
+ // Make sure we run the
history storing code before we make this change
+
context.fn.updateHistory( context.oldDelayedHTML != context.$content.html() );
+
context.oldDelayedHistoryPosition = context.historyPosition;
+ context.historyPosition
= newPosition;
+ // Change state
+ // FIXME: Destroys
event handlers, will be a problem with template folding
+ context.$content.html(
+
context.history[context.history.length + context.historyPosition].html
+ );
+
[MediaWiki-CVS] SVN: [62684] trunk/extensions/LiquidThreads
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62684
Revision: 62684
Author: werdna
Date: 2010-02-19 00:48:59 + (Fri, 19 Feb 2010)
Log Message:
---
Major refactoring of LiquidThreads post/reply logic. Now split a 200-line
function with if() blocks all over the place into 3 100-line functions. Also
refactored postEditUpdates() while I was at it, which was also in a major
shambles. Ding, dong, showEditingFormInGeneral() is dead.
Modified Paths:
--
trunk/extensions/LiquidThreads/api/ApiThreadAction.php
trunk/extensions/LiquidThreads/classes/Dispatch.php
trunk/extensions/LiquidThreads/classes/View.php
trunk/extensions/LiquidThreads/pages/TalkpageView.php
trunk/extensions/LiquidThreads/pages/ThreadPermalinkView.php
Modified: trunk/extensions/LiquidThreads/api/ApiThreadAction.php
===
--- trunk/extensions/LiquidThreads/api/ApiThreadAction.php 2010-02-19
00:39:48 UTC (rev 62683)
+++ trunk/extensions/LiquidThreads/api/ApiThreadAction.php 2010-02-19
00:48:59 UTC (rev 62684)
@@ -297,8 +297,15 @@
$article->getTitle()->resetArticleID( $articleId );
$title->resetArticleID( $articleId );
- $thread = LqtView::postEditUpdates( 'new', null, $article,
$talkpage,
- $subject, $summary, null, $text, $bump,
$signature );
+ $thread = LqtView::newPostMetadataUpdates(
+ array(
+ 'root' => $article,
+ 'talkpage' => $talkpage,
+ 'subject' => $subject,
+ 'signature' => $signature,
+ 'summary' => $summary,
+ 'text' => $text,
+ ) );
$maxLag = wfGetLB()->getMaxLag();
$maxLag = $maxLag[1];
@@ -404,8 +411,16 @@
return;
}
- $thread = LqtView::postEditUpdates( 'editExisting', null,
$article, $talkpage,
- $subject, $summary, $thread, $text,
$bump, $signature );
+ $thread = LqtView::editMetadataUpdates(
+ array(
+ 'root' => $article,
+ 'thread' => $thread,
+ 'subject' => $subject,
+ 'signature' => $signature,
+ 'summary' => $summary,
+ 'text' => $text,
+ 'bump' => $bump,
+ ) );
$maxLag = wfGetLB()->getMaxLag();
$maxLag = $maxLag[1];
@@ -518,8 +533,15 @@
$article->getTitle()->resetArticleID( $articleId );
$title->resetArticleID( $articleId );
- $thread = LqtView::postEditUpdates( 'reply', $replyTo,
$article, $talkpage,
- $subject, $summary, null, $text, $bump,
$signature );
+ $thread = LqtView::replyMetadataUpdates(
+ array(
+ 'root' => $article,
+ 'replyTo' => $replyTo,
+ 'signature' => $signature,
+ 'summary' => $summary,
+ 'text' => $text,
+ 'bump' => $bump,
+ ) );
$maxLag = wfGetLB()->getMaxLag();
$maxLag = $maxLag[1];
@@ -780,4 +802,4 @@
public function getVersion() {
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}
Modified: trunk/extensions/LiquidThreads/classes/Dispatch.php
===
--- trunk/extensions/LiquidThreads/classes/Dispatch.php 2010-02-19 00:39:48 UTC
(rev 62683)
+++ trunk/extensions/LiquidThreads/classes/Dispatch.php 2010-02-19 00:48:59 UTC
(rev 62684)
@@ -67,8 +67,7 @@
// this clause and the next must be in this order.
$viewname = 'ThreadDiffView';
} else if ( $action == 'history'
- || $request->getVal( 'diff', null ) !== null
- || $request->getVal( 'oldid', null ) !== null ) {
+ || $request->getVal( 'diff', null ) !== null ) {
$viewname = 'IndividualThreadHistoryView';
} else if ( $action == 'protect' || $action == 'unprotect' ) {
$viewname = 'ThreadProtectionFormView';
Modified: trunk/extensions/LiquidThreads/classes/View.php
===
--- trunk/extensions/LiquidThreads/classes/View.php 2010-02-19 00:39:48 UTC
(
[MediaWiki-CVS] SVN: [62683] trunk/extensions/LiquidThreads/api/ApiThreadAction.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62683
Revision: 62683
Author: reedy
Date: 2010-02-19 00:39:48 + (Fri, 19 Feb 2010)
Log Message:
---
Reorganise code file to match "more normal" api layout
Modified Paths:
--
trunk/extensions/LiquidThreads/api/ApiThreadAction.php
Modified: trunk/extensions/LiquidThreads/api/ApiThreadAction.php
===
--- trunk/extensions/LiquidThreads/api/ApiThreadAction.php 2010-02-19
00:25:35 UTC (rev 62682)
+++ trunk/extensions/LiquidThreads/api/ApiThreadAction.php 2010-02-19
00:39:48 UTC (rev 62683)
@@ -1,114 +1,7 @@
'actionMarkRead',
- 'markunread' => 'actionMarkUnread',
- 'split' => 'actionSplit',
- 'merge' => 'actionMerge',
- 'reply' => 'actionReply',
- 'newthread' => 'actionNewThread',
- 'setsubject' => 'actionSetSubject',
- 'setsortkey' => 'actionSetSortkey',
- 'edit' => 'actionEdit',
- );
- }
-
- public function getParamDescription() {
- return array(
- 'thread' => 'A list (pipe-separated) of thread IDs or
titles to act on',
- 'threadaction' => 'The action to take',
- 'token' => 'An edit token (from
?action=query&prop=info&intoken=edit)',
- 'talkpage' => 'The talkpage to act on (if applicable)',
- 'subject' => 'The subject to set for the new or split
thread',
- 'reason' => 'If applicable, the reason/summary for the
action',
- 'newparent' => 'If merging a thread, the ID or title
for its new parent',
- 'text' => 'The text of the post to create',
- 'render' => 'If set, on post/reply methods, the
top-level thread ' .
- 'after the change will be rendered and returned
in the result.',
- 'bump' => 'If set, overrides default behaviour as to
whether or not to ',
- "increase the thread's sort key. If true, sets
it to current " .
- "timestamp. If false, does not set it. Default
depends on " .
- "the action being taken. Presently only works
for newthread " .
- "and reply actions.",
- 'sortkey' => "Specifies the timestamp to which to set a
thread's " .
- "sort key. Must be in the form
MMddhhmmss, " .
- "a unix timestamp or 'now'.",
- 'signature' => 'Specifies the signature to use for that
post. Can be ' .
- 'NULL to specify the default signature',
- );
- }
-
- public function getPossibleErrors() {
- return array_merge( parent::getPossibleErrors(), array(
- array( 'missingparam', 'action' ),
- array( 'missingparam', 'talkpage' ),
- array( 'missingparam', 'subject' ),
- array( 'code' => 'too-many-threads', 'info' => 'You may
only split one thread at a time' ),
- array( 'code' => 'no-specified-threads', 'info' => 'You
must specify a thread to split' ),
- array( 'code' => 'already-top-level', 'info' => 'This
thread is already a top-level thread.' ),
- array( 'code' => 'no-valid-subject', 'info' => 'No
subject, or an invalid subject, was specified' ),
- array( 'code' => 'no-specified-threads', 'info' => 'You
must specify a thread to merge' ),
- array( 'code' => 'no-parent-thread', 'info' => 'You
must specify a new parent thread to merge beneath' ),
- array( 'code' => 'invalid-parent-thread', 'info' =>
'The parent thread you specified was neither the title of a thread, nor a
thread ID.' ),
- array( 'code' => 'invalid-talkpage', 'info' => 'The
talkpage you specified is invalid, or does not have discussion threading
enabled.' ),
- array( 'code' => 'talkpage-protected', 'info' => 'You
cannot post to the specified talkpage, because it is protected from new posts'
),
- array( 'code' => 'invalid-subject', 'info' => 'The
subject you specified is not valid' ),
- array( 'code' => 'no-text', 'info' => 'You must include
text in your post' ),
- array( 'code' => 'too-many-threads', 'info' => 'You may
only edit one thread at a time' ),
- array( 'code' => 'invalid-subject', 'info' => 'You must
specify a thread to edit' ),
-
[MediaWiki-CVS] SVN: [62682] trunk/extensions/UsabilityInitiative/js/plugins/jquery. wikiEditor.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62682
Revision: 62682
Author: nimishg
Date: 2010-02-19 00:25:35 + (Fri, 19 Feb 2010)
Log Message:
---
more MS Word fun
Modified Paths:
--
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
===
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
2010-02-19 00:01:16 UTC (rev 62681)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
2010-02-19 00:25:35 UTC (rev 62682)
@@ -405,6 +405,11 @@
setTimeout( function() {
// Unwrap the span found in webkit copies
context.$content.find( 'link, style, meta'
).remove(); //MS Word
+ context.$content.find('p:not(.wikiEditor)
p:not(.wikiEditor)') //MS Word+webkit
+ .each(
function(){
+
var outerParent = $(this).parent();
+
outerParent.replaceWith( outerParent.childNodes() );
+ });
context.$content.find( 'span.Apple-style-span'
).each( function() {
$( this.childNodes ).insertBefore( this
);
} ).remove(); //Apple Richtext
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62681] trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62681
Revision: 62681
Author: reedy
Date: 2010-02-19 00:01:16 + (Fri, 19 Feb 2010)
Log Message:
---
Fixup original fail in method naming, seems this didn't get commited
Modified Paths:
--
trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php
Modified: trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php
===
--- trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php2010-02-18
23:57:06 UTC (rev 62680)
+++ trunk/extensions/GlobalBlocking/ApiQueryGlobalBlocks.php2010-02-19
00:01:16 UTC (rev 62681)
@@ -206,7 +206,7 @@
return 'List all globally blocked IP addresses.';
}
- public function getParamDescription() {
+ public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(), array(
array ( 'code' => 'cidrtoobroad', 'info' => 'CIDR
ranges broader than /16 are not accepted' ),
) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62680] trunk/extensions/Configure/Configure.api.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62680
Revision: 62680
Author: reedy
Date: 2010-02-18 23:57:06 + (Thu, 18 Feb 2010)
Log Message:
---
getPossibleErrors for Configure.api.php
Modified Paths:
--
trunk/extensions/Configure/Configure.api.php
Modified: trunk/extensions/Configure/Configure.api.php
===
--- trunk/extensions/Configure/Configure.api.php2010-02-18 20:43:46 UTC
(rev 62679)
+++ trunk/extensions/Configure/Configure.api.php2010-02-18 23:57:06 UTC
(rev 62680)
@@ -356,6 +356,14 @@
'group' => 'Whether to group settings',
);
}
+
+ protected function getPossibleErrors() {
+ return array_merge( parent::getPossibleErrors(), array(
+ array( 'code' => 'noconf', 'info' => 'You need to call
efConfigureSetup() to use this module' ),
+ array( 'code' => 'noversion', 'info' => 'version not
found' ),
+ array( 'code' => 'nowiki', 'info' => 'wiki not found in
version' ),
+ ) );
+ }
protected function getDescription() {
return 'Configure extension\'s API module';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62679] trunk/extensions/Configure
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62679
Revision: 62679
Author: ialex
Date: 2010-02-18 20:43:46 + (Thu, 18 Feb 2010)
Log Message:
---
Added support for GroupsSidebar, QPoll, SendmailToWiki, TemplateInfo, Validator
and Wikilog extensions
Modified Paths:
--
trunk/extensions/Configure/CHANGELOG
trunk/extensions/Configure/Configure.php
trunk/extensions/Configure/scripts/findSettings.php
trunk/extensions/Configure/settings/Settings-ext.txt
Modified: trunk/extensions/Configure/CHANGELOG
===
--- trunk/extensions/Configure/CHANGELOG2010-02-18 20:13:15 UTC (rev
62678)
+++ trunk/extensions/Configure/CHANGELOG2010-02-18 20:43:46 UTC (rev
62679)
@@ -1,6 +1,10 @@
This file lists changes on this extension.
Localisation updates are done on betawiki and aren't listed here.
+0.15.10 - 18 February 2010
+ Added support for GroupsSidebar, QPoll, SendmailToWiki, TemplateInfo,
+ Validator and Wikilog extensions.
+
0.15.9 - 17 February 2010
Updated CentralAuth, CodeReview, ExternalData, FlaggedRevs, DynamicPageList,
OggHandler, OpenID, SemanticForms and Translate extensions.
Modified: trunk/extensions/Configure/Configure.php
===
--- trunk/extensions/Configure/Configure.php2010-02-18 20:13:15 UTC (rev
62678)
+++ trunk/extensions/Configure/Configure.php2010-02-18 20:43:46 UTC (rev
62679)
@@ -18,7 +18,7 @@
'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
'description' => 'Allow authorised users to configure the wiki via a
web-based interface',
'descriptionmsg' => 'configure-desc',
- 'version' => '0.15.9',
+ 'version' => '0.15.10',
);
# Configuration part
Modified: trunk/extensions/Configure/scripts/findSettings.php
===
--- trunk/extensions/Configure/scripts/findSettings.php 2010-02-18 20:13:15 UTC
(rev 62678)
+++ trunk/extensions/Configure/scripts/findSettings.php 2010-02-18 20:43:46 UTC
(rev 62679)
@@ -75,6 +75,7 @@
'wgGoogleAdSenseCssLocation',
'wgOggScriptVersion', 'wgEnableJS2system',
'wgPFHookStub',
+ 'wgQPollFunctionsHook', 'cell', 'celltag',
'sdgIP', 'sdgScriptPath', 'sdgNamespaceIndex',
'sfgIP', 'sfgScriptPath', 'sfgNamespaceIndex',
'smwgIP', 'smwgScriptPath',
'smwgNamespaceIndex', 'smwgRAPPath', 'smwgSMWBetaCompatible',
@@ -86,11 +87,14 @@
'wgSpecialRefactorVersion',
'wgUniwikiFormatChangesObject',
'wgGenericEditPageClass', 'wgSwitchMode',
+ 'egValidatorDir',
'wgWatchersAddCache',
'wgWikiArticleFeedsParser', 'wgWikiFeedPresent',
+ 'wgWikilogStylePath',
);
$ignoreObsolete = array(
'wgCommentSpammerLog',
+ 'qp_enable_showresults',
);
foreach ( $exts as $ext ) {
if( !$ext->isInstalled() ) continue; // must
exist
Modified: trunk/extensions/Configure/settings/Settings-ext.txt
===
--- trunk/extensions/Configure/settings/Settings-ext.txt2010-02-18
20:13:15 UTC (rev 62678)
+++ trunk/extensions/Configure/settings/Settings-ext.txt2010-02-18
20:43:46 UTC (rev 62679)
@@ -552,6 +552,11 @@
GroupPortal
url = http://www.mediawiki.org/wiki/Extension:GroupPortal
+GroupsSidebar
+settings[] = wgGroupsSidebar: array
+array[] = wgGroupsSidebar: assoc
+url = http://www.mediawiki.org/wiki/Extension:GroupsSidebar
+
ImageMap
url = http://www.mediawiki.org/wiki/Extension:ImageMap
@@ -664,6 +669,11 @@
PurgeCache
url = http://www.mediawiki.org/wiki/Extension:PurgeCache
+QPoll
+file = qp_user.php
+settings[] = qp_enable_showresults: int
+url = http://www.mediawiki.org/wiki/Extension:QPoll
+
Redirect
url = http://www.mediawiki.org/wiki/Extension:Redirect
@@ -780,6 +790,9 @@
extensions-dependencies[] = SemanticMediaWiki
url = http://www.mediawiki.org/wiki/Extension:Semantic_Result_Formats
+SendmailToWiki
+url = http://www.mediawiki.org/wiki/Extension:SendmailToWiki
+
SkinPerNamespace
settings[] = wgSkinPerNamespace: array
settings[] = wgSkinPerSpecialPage: array
@@ -807,6 +820,9 @@
settings[] = wgSyntaxHighlightDefaultLang: text
url = http://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi
+TemplateInfo
+url = http://www.mediawiki.org/wiki/Extension:TemplateInfo
+
[MediaWiki-CVS] SVN: [62677] branches/js2-work/phase3/js/mwEmbed
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62677
Revision: 62677
Author: dale
Date: 2010-02-18 19:39:11 + (Thu, 18 Feb 2010)
Log Message:
---
* added jQuery build-out of interface components ( just for mvpcf skin so far )
* still have to merge bindings.
Modified Paths:
--
branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js
branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
Modified: branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js
===
--- branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js
2010-02-18 19:22:48 UTC (rev 62676)
+++ branches/js2-work/phase3/js/mwEmbed/modules/AddMedia/loader.js
2010-02-18 19:39:11 UTC (rev 62677)
@@ -2,7 +2,7 @@
* Loader for libAddMedia module:
*/
-// Scope everythign in "mw" ( keeps the global namespace clean )
+// Scope everything in "mw" ( keeps the global namespace clean )
( function( mw ) {
mw.addMessages( {
@@ -86,7 +86,8 @@
*
* Includes both firefogg & firefogg "GUI" which share some loading
logic:
*/
-
+
+ // Clone the baseUploadlibs array
var mwBaseFirefoggReq = baseUploadlibs.slice( 0 )
mwBaseFirefoggReq[0].push('mw.Firefogg');
Modified: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
===
--- branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-02-18 19:22:48 UTC
(rev 62676)
+++ branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-02-18 19:39:11 UTC
(rev 62677)
@@ -1807,7 +1807,6 @@
* Wrapper for jQuery getScript,
* Uses the scriptLoader if enabled
*
- * If jQuery is not ready load it.
*
* @param {String} scriptRequest The requested path or classNames for
the scriptLoader
* @param {Function} callback Function to call once script is loaded
@@ -1817,13 +1816,15 @@
// Set the base url based scriptLoader availability & type of
scriptRequest
// ( presently script loader only handles "classes" not
relative urls:
var slpath = mw.getScriptLoaderPath();
- // Check if its a relative path name, ( ie does not start with
"/" and does not include ://
- var isRelativePath = ( scriptRequest.indexOf('://') == -1 &&
scriptRequest.indexOf('/') !== 0 )? true : false;
- if( slpath && isRelativePath ) {
+
+ // Check if its a class name, ( ie does not start with "/" and
does not include ://
+ var isClassName = ( scriptRequest.indexOf('://') == -1 &&
scriptRequest.indexOf('/') !== 0 )? true : false;
+
+ if( slpath && isClassName ) {
url = slpath + '?class=' + scriptRequest;
}else{
// Add the mwEmbed path if a relative path request
- url = ( isRelativePath )? mw.getMwEmbedPath() : '';
+ url = ( isClassName ) ? mw.getMwEmbedPath() : '';
url+= scriptRequest;
}
@@ -1835,7 +1836,7 @@
mw.log( 'mw.getScript: ' + url );
// If jQuery is available and debug is off load the scirpt via
jQuery
//( will use XHR if on same domain )
- if( mw.isset( 'window.jQuery' ) && mw.getConfig( 'debug' ) ===
false ) {
+ if( mw.isset( 'window.jQuery' ) && mw.getConfig( 'debug' ) ===
false ) {
$j.getScript( url, function(){
if( callback )
callback( scriptRequest );
@@ -2126,7 +2127,6 @@
// If we're in debug mode, get a fresh unique request key and
pass on "debug" param
if ( mw.parseUri( mwEmbedSrc ).queryKey['debug'] == 'true' ) {
-
mw.setConfig( 'debug', true );
var d = new Date();
req_param += 'urid=' + d.getTime() + '&debug=true';
Modified: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
===
--- branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js2010-02-18
19:22:48 UTC (rev 62676)
+++ branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js2010-02-18
19:39:11 UTC (rev 62677)
@@ -72,17 +72,16 @@
embedPlayer.$interface.find('.control-bar').remove();
// Add some space to control_wrap for the control bar:
- embedPlayer.$interface.css({
+ embedPlayer.$interface.css( {
[MediaWiki-CVS] SVN: [62676] trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62676
Revision: 62676
Author: raymond
Date: 2010-02-18 19:22:48 + (Thu, 18 Feb 2010)
Log Message:
---
Linux likes correct spelling
Modified Paths:
--
trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php
Modified: trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php
===
--- trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php 2010-02-18
18:00:57 UTC (rev 62675)
+++ trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php 2010-02-18
19:22:48 UTC (rev 62676)
@@ -230,7 +230,7 @@
global $wgDBtype, $wgExtNewFields, $wgExtPGNewFields, $wgExtNewTables,
$wgExtNewIndexes;
$base = dirname( __FILE__ );
if ( $wgDBtype == 'mysql' ) {
- $wgExtNewTables[] = array( 'account_requests',
"$base/confirmaccount.sql" );
+ $wgExtNewTables[] = array( 'account_requests',
"$base/ConfirmAccount.sql" );
$wgExtNewFields[] = array( 'account_requests', 'acr_filename',
"$base/archives/patch-acr_filename.sql" );
@@ -241,7 +241,7 @@
$wgExtNewIndexes[] = array( 'account_requests', 'acr_email',
"$base/archives/patch-email-index.sql" );
} else if ( $wgDBtype == 'postgres' ) {
- $wgExtNewTables[] = array( 'account_requests',
"$base/confirmaccount.pg.sql" );
+ $wgExtNewTables[] = array( 'account_requests',
"$base/ConfirmAccount.pg.sql" );
$wgExtPGNewFields[] = array( 'account_requests', 'acr_held',
"TIMESTAMPTZ" );
$wgExtPGNewFields[] = array( 'account_requests',
'acr_filename', "TEXT" );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62675] trunk/phase3/languages/messages/MessagesHe.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62675 Revision: 62675 Author: rotem Date: 2010-02-18 18:00:57 + (Thu, 18 Feb 2010) Log Message: --- Localization update for he. Modified Paths: -- trunk/phase3/languages/messages/MessagesHe.php Modified: trunk/phase3/languages/messages/MessagesHe.php === --- trunk/phase3/languages/messages/MessagesHe.php 2010-02-18 17:24:21 UTC (rev 62674) +++ trunk/phase3/languages/messages/MessagesHe.php 2010-02-18 18:00:57 UTC (rev 62675) @@ -819,6 +819,7 @@ 'resetpass_forbidden' => 'לא ניתן לשנות סיסמאות.', 'resetpass-no-info' => 'עליכם להיכנס לחשבון כדי לגשת לדף זה באופן ישיר.', 'resetpass-submit-loggedin' => 'שינוי סיסמה', +'resetpass-submit-cancel' => 'ביטול', 'resetpass-wrong-oldpass' => 'הסיסמה הזמנית או הנוכחית אינה תקינה. ייתכן שכבר שיניתם את סיסמתכם או שכבר ביקשתם סיסמה זמנית חדשה.', 'resetpass-temp-password' => 'סיסמה זמנית:', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62674] branches/js2-work/phase3/includes/GlobalFunctions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62674
Revision: 62674
Author: demon
Date: 2010-02-18 17:24:21 + (Thu, 18 Feb 2010)
Log Message:
---
(bug 22573) Leftover debug line in GlobalSettings
Modified Paths:
--
branches/js2-work/phase3/includes/GlobalFunctions.php
Modified: branches/js2-work/phase3/includes/GlobalFunctions.php
===
--- branches/js2-work/phase3/includes/GlobalFunctions.php 2010-02-18
14:53:30 UTC (rev 62673)
+++ branches/js2-work/phase3/includes/GlobalFunctions.php 2010-02-18
17:24:21 UTC (rev 62674)
@@ -708,9 +708,6 @@
}
} else {
$lang = wfGetLangObj( $langCode );
-
- print_r($lang);
-
# MessageCache::get() does this already, Language::getMessage()
doesn't
# ISSUE: Should we try to handle "message/lang" here too?
$key = str_replace( ' ' , '_' , $wgContLang->lcfirst( $key ) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [62673] trunk/phase3/includes/api/ApiLogin.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62673
Revision: 62673
Author: ashley
Date: 2010-02-18 14:53:30 + (Thu, 18 Feb 2010)
Log Message:
---
API login module: coding style cleanup, remove stray semicolon, use proper
copyright symbol
Modified Paths:
--
trunk/phase3/includes/api/ApiLogin.php
Modified: trunk/phase3/includes/api/ApiLogin.php
===
--- trunk/phase3/includes/api/ApiLogin.php 2010-02-18 05:27:48 UTC (rev
62672)
+++ trunk/phase3/includes/api/ApiLogin.php 2010-02-18 14:53:30 UTC (rev
62673)
@@ -1,11 +1,11 @@
@gmail.com,
+ * Copyright © 2006-2007 Yuri Astrakhan @gmail.com,
* Daniel Cannon (cannon dot danielc at gmail dot com)
*
* This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
if ( !defined( 'MEDIAWIKI' ) ) {
// Eclipse helper - will be ignored in production
- require_once ( 'ApiBase.php' );
+ require_once( 'ApiBase.php' );
}
/**
@@ -37,7 +37,7 @@
class ApiLogin extends ApiBase {
public function __construct( $main, $action ) {
- parent :: __construct( $main, $action, 'lg' );
+ parent::__construct( $main, $action, 'lg' );
}
/**
@@ -48,15 +48,13 @@
* user, or any other reason, the host is cached with an expiry
* and no log-in attempts will be accepted until that expiry
* is reached. The expiry is $this->mLoginThrottle.
-*
-* @access public
*/
public function execute() {
$params = $this->extractRequestParams();
- $result = array ();
+ $result = array();
- $req = new FauxRequest( array (
+ $req = new FauxRequest( array(
'wpName' => $params['name'],
'wpPassword' => $params['password'],
'wpDomain' => $params['domain'],
@@ -70,7 +68,7 @@
$loginForm = new LoginForm( $req );
switch ( $authRes = $loginForm->authenticateUserData() ) {
- case LoginForm :: SUCCESS :
+ case LoginForm::SUCCESS:
global $wgUser, $wgCookiePrefix;
$wgUser->setOption( 'rememberpassword', 1 );
@@ -89,48 +87,48 @@
$result['sessionid'] = session_id();
break;
- case LoginForm :: NO_NAME :
+ case LoginForm::NO_NAME:
$result['result'] = 'NoName';
break;
- case LoginForm :: ILLEGAL :
+ case LoginForm::ILLEGAL:
$result['result'] = 'Illegal';
break;
- case LoginForm :: WRONG_PLUGIN_PASS :
+ case LoginForm::WRONG_PLUGIN_PASS:
$result['result'] = 'WrongPluginPass';
break;
- case LoginForm :: NOT_EXISTS :
+ case LoginForm::NOT_EXISTS:
$result['result'] = 'NotExists';
break;
-
- case LoginForm :: RESET_PASS : // bug 20223 - Treat a
temporary password as wrong. Per SpecialUserLogin - "The e-mailed temporary
password should not be used for actual logins;"
- case LoginForm :: WRONG_PASS :
+
+ case LoginForm::RESET_PASS: // bug 20223 - Treat a
temporary password as wrong. Per SpecialUserLogin - "The e-mailed temporary
password should not be used for actual logins;"
+ case LoginForm::WRONG_PASS:
$result['result'] = 'WrongPass';
break;
- case LoginForm :: EMPTY_PASS :
+ case LoginForm::EMPTY_PASS:
$result['result'] = 'EmptyPass';
break;
- case LoginForm :: CREATE_BLOCKED :
+ case LoginForm::CREATE_BLOCKED:
$result['result'] = 'CreateBlocked';
$result['details'] = 'Your IP address is
blocked from account creation';
break;
- case LoginForm :: THROTTLED :
+ case LoginForm::THROTTLED:
global $wgPasswordAttemptThrottle;
$result['result'] = 'Throttled';
$result['wait'] = intval(
$wgPasswordAttemptThrottle['seconds'] );
break;
-
- case LoginForm :
