[MediaWiki-CVS] SVN: [94602] trunk/parsers/wikidom/lib/es/es.ListBlock.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94602
Revision: 94602
Author: inez
Date: 2011-08-16 06:03:48 + (Tue, 16 Aug 2011)
Log Message:
---
Implementation of getLength and insertContent for ListBlock
Modified Paths:
--
trunk/parsers/wikidom/lib/es/es.ListBlock.js
Modified: trunk/parsers/wikidom/lib/es/es.ListBlock.js
===
--- trunk/parsers/wikidom/lib/es/es.ListBlock.js2011-08-16 05:37:18 UTC
(rev 94601)
+++ trunk/parsers/wikidom/lib/es/es.ListBlock.js2011-08-16 06:03:48 UTC
(rev 94602)
@@ -119,6 +119,32 @@
return lineIndex;
};
+/**
+ * Gets the length of all block content.
+ *
+ * @method
+ * @returns {Integer} Length of content
+ */
+es.ListBlock.prototype.getLength = function( ) {
+ var length = 0;
+ this.list.traverseItems( function( item, index ) {
+ length += item.content.getLength() + 1;
+ } );
+ return length === 0 ? 0 : length - 1;
+};
+
+/**
+ * Inserts content into a block at an offset.
+ *
+ * @method
+ * @param offset {Integer} Position to insert content at
+ * @param content {Object} Content to insert
+ */
+es.ListBlock.prototype.insertContent = function( offset, content ) {
+ var location = this.getLocationFromOffset( offset );
+ location.item.flow.content.insert( location.offset, content );
+};
+
es.ListBlock.prototype.getText = function( range, render ) {
return ;
};
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94603] trunk/extensions/RSS/RSS.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94603
Revision: 94603
Author: wikinaut
Date: 2011-08-16 06:59:12 + (Tue, 16 Aug 2011)
Log Message:
---
fix of a whitespace problem in the i18n system message
Modified Paths:
--
trunk/extensions/RSS/RSS.i18n.php
Modified: trunk/extensions/RSS/RSS.i18n.php
===
--- trunk/extensions/RSS/RSS.i18n.php 2011-08-16 06:03:48 UTC (rev 94602)
+++ trunk/extensions/RSS/RSS.i18n.php 2011-08-16 06:59:12 UTC (rev 94603)
@@ -11,6 +11,7 @@
/** English
* @author Łukasz Garczewski (TOR) t...@wikia-inc.com
*/
+
$messages['en'] = array(
'rss-desc' = 'Displays RSS feeds on MediaWiki pages in a standard or
in user-definable formats using template pages',
'rss-error' = 'Failed to load RSS feed from $1: $2',
@@ -21,7 +22,7 @@
'rss-ns-permission' = 'RSS is not allowed in this namespace',
'rss-url-permission' = 'This URL is not allowed to be included',
'rss-item' = '{{$1 | title = {{{title}}} | link = {{{link}}} | date =
{{{date}}} | author = {{{author}}} | description = {{{description}}} }}',
- 'rss-feed' = !-- the following are two alternative templates. The
first is the basic default template for feeds --; '''span
class='plainlinks'[{{{link}}} {{{title}}}]/span'''
+ 'rss-feed' = !-- the following are two alternative templates. The
first is the basic default template for feeds --; '''span
class='plainlinks'[{{{link}}} {{{title}}}]/span'''
: {{{description}}}
: {{{author}}} {{{date}}}!-- don't use newline here --!-- The second is an
improved version which requires Extension:ParserFunctions --!-- ; '''span
class='plainlinks'[{{{link}}} {{{title}}}]/span'''{{#if:
{{{description|}}}|: {{{description}{{#if: {{{author|}}} | {{#if:
{{{date|}}} |: mdash; {{{author}}} {{{date} | {{#if: {{{author|}}}|:
mdash; {{{author} {{#if: {{{date|}}}|:{{{date}|}} --,
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94604] trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94604 Revision: 94604 Author: aaron Date: 2011-08-16 06:59:18 + (Tue, 16 Aug 2011) Log Message: --- Removed unused MW_DBNAME crap Modified Paths: -- trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php Modified: trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php === --- trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2011-08-16 06:59:12 UTC (rev 94603) +++ trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2011-08-16 06:59:18 UTC (rev 94604) @@ -175,7 +175,6 @@ } $this-db = $dbname; - putenv( 'MW_DBNAME=' . $dbname ); } /** @@ -190,7 +189,6 @@ $dbSuffix = $site; } $this-db = str_replace( -, _, $lang . $dbSuffix ); - putenv( 'MW_DBNAME=' . $this-db ); } /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94605] trunk/extensions/SemanticMediaWiki/specials/AskSpecial
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94605
Revision: 94605
Author: devayon
Date: 2011-08-16 06:59:35 + (Tue, 16 Aug 2011)
Log Message:
---
fixed broken code. Broke because of use of Xml::hidden()
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 06:59:18 UTC (rev 94604)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 06:59:35 UTC (rev 94605)
@@ -47,7 +47,6 @@
* @global WebRequest $wgRequest
* @global boolean $smwgQEnabled
* @param string $p the sub-page string
-* @todo: using processXXXBox() methods here goes against the general
architecture. Move this to the UI implementation
*/
public function execute( $p ) {
global $wgOut, $wgRequest, $smwgQEnabled, $wgFeedClasses;
@@ -63,13 +62,7 @@
// the 'q' is dependent from the form parameter
set by getQueryFormBox()
// and processQueryFormBox()
if ( $wgRequest-getCheck( 'q' ) ) {
- $params = array_merge(
- array(
- 'format' =
$wgRequest-getVal( 'format' ),
- 'offset' =
$wgRequest-getVal( 'offset', '0' ),
- 'limit' =
$wgRequest-getVal( 'limit', '20' ) ),
-
$this-processPoSortFormBox( $wgRequest ),
-
$this-processFormatSelectBox( $wgRequest ) );
+ $params = $this-processParams();
$this-uiCore =
SMWQueryUIHelper::makeForUI(
$this-processQueryFormBox( $wgRequest ),
$params,
@@ -84,10 +77,10 @@
$this-uiCore =
SMWQueryUIHelper::makeForInfoLink( $p );
}
// adding rss feed of results to the page head
- if ( ( $this-uiCore-getQueryString() !== '' )
- and ( $this-isSyndicated() )
- and ( method_exists( $wgOut,
'addFeedlink' ) ) // remove this line after MW 1.5 is no longer supported by SMW
- and ( array_key_exists( 'rss',
$wgFeedClasses ) ) ) {
+ if ( ( $this-isSyndicated() )
+(
$this-uiCore-getQueryString() !== '' )
+( method_exists( $wgOut,
'addFeedlink' ) ) // remove this line after MW 1.5 is no longer supported by SMW
+( array_key_exists( 'rss',
$wgFeedClasses ) ) ) {
$res = $this-uiCore-getResultObject();
$link = $res-getQueryLink();
$link-setParameter( 'rss', 'format' );
@@ -103,6 +96,16 @@
}
/**
+* This method should call the various processXXXBox() methods for each
of
+* the corresponding getXXXBox() methods which the UI uses.
+* Merge the results of these methods and return them.
+*
+* @global WebRequest $wgRequest
+* @return array
+*/
+ protected abstract function processParams();
+
+ /**
* To enable/disable syndicated feeds of results to appear in the UI
header
*
* @return boolean
@@ -691,19 +694,19 @@
$result .= Xml::checkLabel( wfMsg(
'smw_qui_shownresults' ), display[$i], display$i, $if4 );
if ( is_array( $propertyLabelValues )
array_key_exists( $key, $propertyLabelValues ) ) {
- $result .= Xml::hidden(
prop_label[$i], $propertyLabelValues[$key], array( 'id' = prop_label$i ) );
+ $result .= Html::hidden(
prop_label[$i], $propertyLabelValues[$key], array( 'id' = prop_label$i ) );
} else {
- $result .= Xml::hidden(
prop_label[$i], '', array( 'id' = prop_label$i
[MediaWiki-CVS] SVN: [94606] trunk/tools/mwmultiversion/scripts
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94606 Revision: 94606 Author: aaron Date: 2011-08-16 07:04:24 + (Tue, 16 Aug 2011) Log Message: --- Merged scap-1versions into scap Modified Paths: -- trunk/tools/mwmultiversion/scripts/scap Removed Paths: - trunk/tools/mwmultiversion/scripts/scap-1versions Modified: trunk/tools/mwmultiversion/scripts/scap === --- trunk/tools/mwmultiversion/scripts/scap 2011-08-16 06:59:35 UTC (rev 94605) +++ trunk/tools/mwmultiversion/scripts/scap 2011-08-16 07:04:24 UTC (rev 94606) @@ -65,7 +65,7 @@ $BINDIR/set-group-write echo 'Copying wikiversions dat file to apaches...' -ddsh -F30 -cM -g mediawiki-installation 'if [ -x /home/wikipedia/bin/scap-1versions ]; then echo /home-mounted apache $(hostname); /home/wikipedia/bin/scap-1versions; else /usr/bin/scap-1versions; fi' +ddsh -F30 -cM -g mediawiki-installation 'sudo -u mwdeploy rsync -l 10.0.5.8::common/wikiversions.dat /usr/local/apache/common-local/wikiversions.dat' echo 'Copying style sheets to apaches...' ddsh -F30 -cM -g mediawiki-installation 'if [ -x /home/wikipedia/bin/scap-1skins ]; then echo /home-mounted apache $(hostname); /home/wikipedia/bin/scap-1skins; else /usr/bin/scap-1skins; fi' Deleted: trunk/tools/mwmultiversion/scripts/scap-1versions === --- trunk/tools/mwmultiversion/scripts/scap-1versions 2011-08-16 06:59:35 UTC (rev 94605) +++ trunk/tools/mwmultiversion/scripts/scap-1versions 2011-08-16 07:04:24 UTC (rev 94606) @@ -1,3 +0,0 @@ -#!/bin/bash - -sudo -u mwdeploy rsync -l 10.0.5.8::common/wikiversions.dat /usr/local/apache/common-local/wikiversions.dat ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94607] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_QueryUIHelper.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94607
Revision: 94607
Author: devayon
Date: 2011-08-16 07:07:42 + (Tue, 16 Aug 2011)
Log Message:
---
decoupling parameter 'q' from execute() and some style fixes
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 07:04:24 UTC (rev 94606)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 07:07:42 UTC (rev 94607)
@@ -59,9 +59,7 @@
$format_options_requested =
$this-processFormatOptions( $wgRequest ); // handling ajax for format options
if ( !$format_options_requested ) {
// Checking if a query string has been sent by
using the form
- // the 'q' is dependent from the form parameter
set by getQueryFormBox()
- // and processQueryFormBox()
- if ( $wgRequest-getCheck( 'q' ) ) {
+ if ( !( $this-processQueryFormBox( $wgRequest
) === false ) ) {
$params = $this-processParams();
$this-uiCore =
SMWQueryUIHelper::makeForUI(
$this-processQueryFormBox( $wgRequest ),
@@ -354,7 +352,7 @@
$result .= '/div';
$this-enableJQuery();
$wgOut-addScriptFile(
$smwgScriptPath/skins/elastic/jquery.elastic.source.js );
-
+
/*
* Compatibity function for disabling elastic textboxes for IE.
This may
* be removed when jQuery 1.4 or above is supported.
@@ -381,12 +379,15 @@
* parameters.
*
* @param WebRequest $wgRequest
-* @return string
+* @return mixed returns the querystring if possible, false if no
querystring is set
*/
protected function processQueryFormBox( WebRequest $wgRequest ) {
- $query = '';
- if ( $wgRequest-getCheck( 'q' ) ) $query = $wgRequest-getVal(
'q' );
- return $query;
+ if ( $wgRequest-getCheck( 'q' ) ) {
+ $query = $wgRequest-getVal( 'q' );
+ return $query;
+ } else {
+ return false;
+ }
}
/**
@@ -675,7 +676,7 @@
*/
$result .= Html::openElement( 'div', array(
'id' = sort_div_$i, 'class' = 'smwsort' ) );
$result .= 'span class=smwquisortlabelspan
class=smw-removea href=javascript:removePOInstance(\'sort_div_' . $i .
'\')img src=' . $smwgScriptPath . '/skins/images/close-button.png alt=' .
wfMsg( 'smw_qui_delete' ) . '/a/span';
- $result .= wfMsg( 'smw_qui_property'
).'/span';
+ $result .= wfMsg( 'smw_qui_property' ) .
'/span';
$result .= Html::input( 'property[' . $i . ']',
$propertyValues[$key], 'text', array( 'size' = '35', 'id' = property$i ) )
. \n;
$result .= Html::openElement( 'select', array(
'name' = order[$i] ) );
@@ -722,7 +723,7 @@
*/
$result .= Html::openElement( 'div', array(
'id' = sort_div_$i, 'class' = 'smwsort' ) );
$result .= 'span class=smwquisortlabelspan
class=smw-removea href=javascript:removePOInstance(\'sort_div_' . $i .
'\')img src=' . $smwgScriptPath . '/skins/images/close-button.png alt=' .
wfMsg( 'smw_qui_delete' ) . '/a/span' .
- wfMsg(
'smw_qui_category' ) .'/span'.
+ wfMsg(
'smw_qui_category' ) . '/span' .
Xml::input(
category[$i], '25', $categoryValues[$key], array( 'id' = category$i ) ) .
.
Html::hidden(
cat_label[$i], $categoryLabelValues[$key], array( 'id' = cat_label$i ) ) .
Html::hidden(
cat_yes[$i], $categoryYesValues[$key], array( 'id' = cat_yes$i ) ) .
@@ -737,7 +738,7 @@
*/
$result .= Html::openElement( 'div', array(
'id' = sort_div_$i, 'class' = 'smwsort' ) ) .
'span class=smwquisortlabelspan
class=smw-removea href=javascript:removePOInstance(\'sort_div_' .
[MediaWiki-CVS] SVN: [94608] trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94608
Revision: 94608
Author: aaron
Date: 2011-08-16 07:13:52 + (Tue, 16 Aug 2011)
Log Message:
---
Fixed XSS
Modified Paths:
--
trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
Modified: trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php
===
--- trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2011-08-16
07:07:42 UTC (rev 94607)
+++ trunk/tools/mwmultiversion/multiversion/MWMultiVersion.php 2011-08-16
07:13:52 UTC (rev 94608)
@@ -41,7 +41,7 @@
*/
private static function createInstance() {
if ( isset( self::$instance ) ) {
- die( MWMultiVersion instance already set!\n );
+ self::error( MWMultiVersion instance already set!\n );
}
self::$instance = new self;
return self::$instance;
@@ -101,7 +101,7 @@
$matches = array();
if ( $secure ) {
if ( !preg_match('/^([^.]+)\.([^.]+)\./', $secure,
$matches ) ) {
- die( Invalid hostname.\n );
+ self::error( Invalid hostname.\n );
}
$lang = $matches[1];
$site = $matches[2];
@@ -126,13 +126,13 @@
} else if ( preg_match(
'/^(.*)\.prototype\.wikimedia\.org$/', $serverName, $matches ) ) {
$lang = $matches[1];
} else {
- die( Invalid host name ($serverName),
can't determine language.\n );
+ self::error( Invalid host name
($serverName), can't determine language.\n );
}
} elseif ( preg_match(
/^\/usr\/local\/apache\/(?:htdocs|common\/docroot)\/([a-z0-9\-_]*)$/,
$docRoot, $matches ) ) {
$site = wikipedia;
$lang = $matches[1];
} else {
- die( Invalid host name (docroot= . $docRoot .
), can't determine language.\n );
+ self::error( Invalid host name (docroot= .
$docRoot . ), can't determine language.\n );
}
}
$this-loadDBFromSite( $site, $lang );
@@ -145,7 +145,7 @@
private function setSiteInfoForUploadWiki( $pathInfo ) {
$pathBits = explode( '/', $pathInfo );
if ( count( $pathBits ) 3 ) {
- die( Invalid file path info (pathinfo= . $pathInfo .
), can't determine language.\n );
+ self::error( Invalid file path info (pathinfo= .
$pathInfo . ), can't determine language.\n );
}
$site = $pathBits[1];
$lang = $pathBits[2];
@@ -171,7 +171,7 @@
}
if ( $dbname === '' ) {
- die( --wiki must be the first parameter.\n );
+ self::error( --wiki must be the first parameter.\n );
}
$this-db = $dbname;
@@ -217,11 +217,11 @@
$extraVersion = false;
} else {
if ( strpos( $version, 'php-' ) !== 0 ) {
- die( wikiversions.cdb version entry
does not start with `php-` (got `$version`).\n );
+ self::error( wikiversions.cdb version
entry does not start with `php-` (got `$version`).\n );
}
$extraVersion = dba_fetch( ext:{$this-db},
$db );
if ( $extraVersion === false ) {
- die( wikiversions.cdb has no extra
version entry for `$db`.\n );
+ self::error( wikiversions.cdb has no
extra version entry for `$db`.\n );
}
}
dba_close( $db );
@@ -241,7 +241,7 @@
*/
private function assertNotMissing() {
if ( $this-isMissing() ) {
- die( wikiversions.cdb has no version entry for
`{$this-db}`.\n );
+ self::error( wikiversions.cdb has no version entry for
`{$this-db}`.\n );
}
}
@@ -295,4 +295,17 @@
}
return $ver;
}
+
+ /**
+* Error out with a die() message
+* @param $msg String
+* @return void
+*/
+ private static function error( $msg ) {
+ $msg = (string)$msg;
+ if ( php_sapi_name() !== 'cli' ) {
+
[MediaWiki-CVS] SVN: [94609] trunk/phase3/tests/qunit
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94609
Revision: 94609
Author: hashar
Date: 2011-08-16 08:04:34 + (Tue, 16 Aug 2011)
Log Message:
---
tests for jquery.highlightText
In r90092, wikinaut requested tests for our highlightText jQuery plugin.
Here is a basic framework than almost anyone can enhance :-)
Modified Paths:
--
trunk/phase3/tests/qunit/index.html
Added Paths:
---
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
Modified: trunk/phase3/tests/qunit/index.html
===
--- trunk/phase3/tests/qunit/index.html 2011-08-16 07:13:52 UTC (rev 94608)
+++ trunk/phase3/tests/qunit/index.html 2011-08-16 08:04:34 UTC (rev 94609)
@@ -44,6 +44,7 @@
script src=../../resources/jquery/jquery.byteLimit.js/script
script src=../../resources/jquery/jquery.colorUtil.js/script
script src=../../resources/jquery/jquery.getAttrs.js/script
+ script src=../../resources/jquery/jquery.highlightText.js/script
script src=../../resources/jquery/jquery.localize.js/script
script src=../../resources/jquery/jquery.tabIndex.js/script
script src=../../resources/jquery/jquery.tablesorter.js/script
@@ -71,6 +72,7 @@
script src=suites/resources/jquery/jquery.byteLimit.test.js/script
script src=suites/resources/jquery/jquery.colorUtil.test.js/script
script src=suites/resources/jquery/jquery.getAttrs.test.js/script
+ script
src=suites/resources/jquery/jquery.highlightText.test.js/script
script src=suites/resources/jquery/jquery.localize.test.js/script
script src=suites/resources/jquery/jquery.tabIndex.test.js/script
script src=suites/resources/jquery/jquery.tablesorter.test.js
charset=UTF-8/script
Added:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
===
---
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
(rev 0)
+++
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
2011-08-16 08:04:34 UTC (rev 94609)
@@ -0,0 +1,37 @@
+module( 'jquery.highlightText' );
+
+test( '-- Initial check', function() {
+ expect(1);
+ ok( $.fn.highlightText, 'jQuery.fn.highlightText defined' );
+} );
+
+test( 'Check', function() {
+ expect(3);
+ var $fixture;
+
+ $fixture = $( 'pBlue Öyster Cult/p' );
+ $fixture.highlightText( 'Blue' );
+ equal(
+ 'span class=highlightBlue/span Öyster Cult',
+ $fixture.html()
+ );
+
+ $fixture = $( 'pÖsterreich/p' );
+ $fixture.highlightText( 'Österreich' );
+ equal(
+ 'span class=highlightÖsterreich/span',
+ $fixture.html()
+ );
+
+ /**
+* Highlighter broken on punctuation mark.
+*/
+ /**
+ $fixture = $( 'pSo good. To be there/p' );
+ $fixture.highlightText( 'good' );
+ equal(
+ 'So span class=highlightgood/span. To be there',
+ $fixture.html()
+ );
+ */
+} );
Property changes on:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
___
Added: svn:eol-style
+ native
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94610] trunk/extensions/SubPageList/SubPageList.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94610 Revision: 94610 Author: siebrand Date: 2011-08-16 08:15:17 + (Tue, 16 Aug 2011) Log Message: --- Fix typo. Modified Paths: -- trunk/extensions/SubPageList/SubPageList.i18n.php Modified: trunk/extensions/SubPageList/SubPageList.i18n.php === --- trunk/extensions/SubPageList/SubPageList.i18n.php 2011-08-16 08:04:34 UTC (rev 94609) +++ trunk/extensions/SubPageList/SubPageList.i18n.php 2011-08-16 08:15:17 UTC (rev 94610) @@ -36,7 +36,7 @@ 'spl-subpages-par-intro' = 'The text to output before the list, if the list is not empty.', 'spl-subpages-par-outro' = 'The text to output after the list, if the list is not empty.', 'spl-subpages-par-default' = 'The text to output instead of the list, if the list is empty. If empty, error message will rendered (such as Page has no subpages to list). If dash (-), result will be completely empty.', - 'spl-subpages-par-separator' = 'The text to output between two list items in case of list (and it\'s alias bar) format. Has no effect in other formats.', + 'spl-subpages-par-separator' = 'The text to output between two list items in case of list (and its alias bar) format. Has no effect in other formats.', 'spl-subpages-par-template' = 'The name of template. The template is applied to every item of the list. An item is passed as the first (unnamed) argument. Note that template does not cancel list formatting. Formatting (ul, ol, list) is applied to the template\'s result.', 'spl-subpages-par-links' = 'If true, list items are rendered as links. If false, list items are rendered as plain text. The latter is especially helpful for passing items into templates for further processing.', ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94611] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_QueryUIHelper.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94611
Revision: 94611
Author: devayon
Date: 2011-08-16 08:27:58 + (Tue, 16 Aug 2011)
Log Message:
---
added minor documentation
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 08:15:17 UTC (rev 94610)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 08:27:58 UTC (rev 94611)
@@ -405,6 +405,7 @@
if ( !$smwgQSortingSupport ) return array();
$params = array();
+ //loading all values from form
$orderValues = $wgRequest-getArray( 'order' );
$propertyValues = $wgRequest-getArray( 'property' );
$propertyLabelValues = $wgRequest-getArray( 'prop_label' );
@@ -417,6 +418,7 @@
$mainColumnLabels = $wgRequest-getArray( 'maincol_label' );
$po = array();
+ // processing params for main result column
if ( is_array( $mainColumnLabels ) ) {
foreach ( $mainColumnLabels as $key = $label ) {
if ( $label == '' ) {
@@ -424,10 +426,9 @@
} else {
$po[$key] = ? = $label;
}
-
}
}
-
+ // processing params for category printouts
$categoryNamespace = $wgContLang-getNsText( NS_CATEGORY );
if ( is_array( $categoryValues ) ) {
foreach ( $categoryValues as $key = $value ) {
@@ -454,6 +455,7 @@
}
}
}
+ // processing params for property printouts
if ( is_array( $propertyValues ) ) {
$params['sort'] = '';
$params['order'] = '';
@@ -491,10 +493,11 @@
if ( is_array(
$propertyLimitValues ) // adding limit
array_key_exists( $key, $propertyLimitValues )
$propertyLimitValues[$key] != '' ) {
+ // / @bug limit, when
specified causes incorrect ordering of printouts
$po[] =
$propertyValues[$key];
$po[] = '+limit=' .
$propertyLimitValues[$key];
} else {
- $po[] =
$propertyValues[$key];
+ $po[$key] =
$propertyValues[$key];
}
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94612] trunk/extensions/SemanticSignup
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94612
Revision: 94612
Author: siebrand
Date: 2011-08-16 08:30:41 + (Tue, 16 Aug 2011)
Log Message:
---
Make message keys extension specific.
Remove unused key 'invaliduname'.
Modified Paths:
--
trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
trunk/extensions/SemanticSignup/includes/SES_Special.php
trunk/extensions/SemanticSignup/includes/SES_UserAccountDataChecker.php
Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16
08:27:58 UTC (rev 94611)
+++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16
08:30:41 UTC (rev 94612)
@@ -17,15 +17,14 @@
$messages['en'] = array(
'semanticsignup' = 'Semantic Signup',
'ses-desc' = 'A MediaWiki extension built on top of Semantic Forms
allowing to populate a user page with semantic data at signup time',
- 'nousername' = 'Username has not been specified',
- 'nopwdmatch' = 'Password and password confirmation don\'t match',
- 'norealname' = 'Real name is required but has not been specified',
- 'userexists' = 'User already exists',
- 'invaliduname' = 'Username specified is not allowed',
- 'emailfailed' = 'Confirmation email sending failed',
- 'createforbidden' = 'Current user is not allowed to create accounts',
- 'throttlehit' = 'New user accounts number maximum per day has been
exceeded for this IP',
- 'ses_userexists' = 'User already exists'
+ 'ses-nousername' = 'Username has not been specified.',
+ 'ses-nopwdmatch' = 'Password and password confirmation do not match.',
+ 'ses-norealname' = 'Real name is required but has not been specified.',
+ 'ses-userexists' = 'User already exists.',
+ 'ses-emailfailed' = 'Confirmation email sending failed.',
+ 'ses-createforbidden' = 'Current user is not allowed to create
accounts.',
+ 'ses-throttlehit' = 'New user accounts number maximum per day has been
exceeded for this IP.',
+ 'ses-userexists' = 'User already exists.'
);
$magicWords = array();
Modified: trunk/extensions/SemanticSignup/includes/SES_Special.php
===
--- trunk/extensions/SemanticSignup/includes/SES_Special.php2011-08-16
08:27:58 UTC (rev 94611)
+++ trunk/extensions/SemanticSignup/includes/SES_Special.php2011-08-16
08:30:41 UTC (rev 94612)
@@ -58,7 +58,7 @@
}
if ( $value $wgAccountCreationThrottle ) {
- throw new Exception(wfMsg('throttlehit'));
+ throw new Exception(wfMsg('ses-throttlehit'));
}
}
@@ -106,7 +106,7 @@
$status = $user-sendConfirmationMail();
if ( !$status-isGood() ) {
- throw new Exception( wfMsg( 'emailfailed' ) .
\n . $status-getMessage() );
+ throw new Exception( wfMsg( 'ses-emailfailed' )
. \n . $status-getMessage() );
}
}
Modified:
trunk/extensions/SemanticSignup/includes/SES_UserAccountDataChecker.php
===
--- trunk/extensions/SemanticSignup/includes/SES_UserAccountDataChecker.php
2011-08-16 08:27:58 UTC (rev 94611)
+++ trunk/extensions/SemanticSignup/includes/SES_UserAccountDataChecker.php
2011-08-16 08:30:41 UTC (rev 94612)
@@ -19,7 +19,7 @@
$name = trim( $this-mUsername );
$this-mUser = User::newFromName( $name, 'creatable' );
if ( !$this-mUser ) {
- $this-error( wfMsg( 'noname' ) );
+ $this-error( wfMsg( 'ses-noname' ) );
}
global $sesRealNameRequired;
@@ -28,7 +28,7 @@
$this-mPassword = $this-getUserDataValue('wpPassword');
$retype = $this-getUserDataValue('wpRetype');
if (strcmp($this-mPassword, $retype))
- $this-error(wfMsg('nopwdmatch'));
+ $this-error(wfMsg('ses-nopwdmatch'));
$this-mDomain = $this-getUserDataValue('wpDomain');
@@ -65,7 +65,7 @@
global $wgUser;
if (!$wgUser-isAllowed( 'createaccount' ) ||
$wgUser-isBlockedFromCreateAccount() )
- $this-error(wfMsg('createforbidden'));
+ $this-error(wfMsg('ses-createforbidden'));
}
public function checkSorbs()
@@ -81,7 +81,7 @@
[MediaWiki-CVS] SVN: [94613] trunk/extensions/SemanticSignup
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94613
Revision: 94613
Author: siebrand
Date: 2011-08-16 08:31:51 + (Tue, 16 Aug 2011)
Log Message:
---
stylize extension
Modified Paths:
--
trunk/extensions/SemanticSignup/INSTALL
trunk/extensions/SemanticSignup/SemanticSignup.hooks.php
trunk/extensions/SemanticSignup/SemanticSignup.i18n.aliases.php
trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
trunk/extensions/SemanticSignup/SemanticSignup.php
trunk/extensions/SemanticSignup/SemanticSignup.settings.php
trunk/extensions/SemanticSignup/includes/SES_DataChecker.php
trunk/extensions/SemanticSignup/includes/SES_SignupFields.php
trunk/extensions/SemanticSignup/includes/SES_Special.php
trunk/extensions/SemanticSignup/includes/SES_UserAccountDataChecker.php
Modified: trunk/extensions/SemanticSignup/INSTALL
===
--- trunk/extensions/SemanticSignup/INSTALL 2011-08-16 08:30:41 UTC (rev
94612)
+++ trunk/extensions/SemanticSignup/INSTALL 2011-08-16 08:31:51 UTC (rev
94613)
@@ -1,5 +1,5 @@
These is the install file for the SemanticSignup extension.
-
+
Extension page on mediawiki.org:
http://www.mediawiki.org/wiki/Extension:SemanticSignup
Latest version of the install file:
http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup/INSTALL?view=co
Modified: trunk/extensions/SemanticSignup/SemanticSignup.hooks.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.hooks.php2011-08-16
08:30:41 UTC (rev 94612)
+++ trunk/extensions/SemanticSignup/SemanticSignup.hooks.php2011-08-16
08:31:51 UTC (rev 94613)
@@ -2,12 +2,12 @@
/**
* Static class for hooks handled by the SemanticSignup extension.
- *
+ *
* @since 0.3
- *
+ *
* @file SemanticSignup.hooks.php
* @ingroup SemanticSignup
- *
+ *
* @licence GNU GPL v3+
* @author Jeroen De Dauw jeroended...@gmail.com
*/
@@ -17,30 +17,30 @@
* @since 0.3
*
* @param $template
- *
+ *
* @return false
*/
public static function onUserCreateForm( $template ) {
if ( is_null( Title::newFromText( SemanticSignupSettings::get(
'formName' ), SF_NS_FORM ) ) ) {
return true;
}
-
+
$url = SemanticSignup::getTitleFor( 'SemanticSignup'
)-escapeFullURL();
global $wgOut;
$wgOut-redirect( $url );
-
+
return false;
}
-
+
/**
* @since 0.3
- *
+ *
* @return true
*/
public static function onParserFirstCallInit() {
global $wgParser;
$wgParser-setFunctionHook( 'signupfields', 'SES_SignupFields::render'
);
-return true;
+return true;
}
}
Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.aliases.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.i18n.aliases.php
2011-08-16 08:30:41 UTC (rev 94612)
+++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.aliases.php
2011-08-16 08:31:51 UTC (rev 94613)
@@ -12,7 +12,7 @@
*/
$aliases = array();
-
+
$aliases['en'] = array(
'SemanticSignup' = array( 'SemanticSignup', 'Semantic Signup' )
);
Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16
08:30:41 UTC (rev 94612)
+++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16
08:31:51 UTC (rev 94613)
@@ -13,7 +13,7 @@
*/
$messages = array();
-
+
$messages['en'] = array(
'semanticsignup' = 'Semantic Signup',
'ses-desc' = 'A MediaWiki extension built on top of Semantic Forms
allowing to populate a user page with semantic data at signup time',
Modified: trunk/extensions/SemanticSignup/SemanticSignup.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 08:30:41 UTC
(rev 94612)
+++ trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 08:31:51 UTC
(rev 94613)
@@ -2,7 +2,7 @@
/**
* Initialization file for the Semantic Signup extension.
- *
+ *
* Documentation:
http://www.mediawiki.org/wiki/Extension:SemanticSignup
* Support
http://www.mediawiki.org/wiki/Extension_talk:SemanticSignup
* Source code:
http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticSignup
@@ -61,7 +61,7 @@
$wgAutoloadClasses['SemanticSignupSettings'] = dirname( __FILE__ ) .
'/SemanticSignup.settings.php';
$wgAutoloadClasses['SemanticSignupHooks'] = dirname(
[MediaWiki-CVS] SVN: [94614] trunk/phase3/tests/qunit/index.html
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94614 Revision: 94614 Author: hashar Date: 2011-08-16 10:28:05 + (Tue, 16 Aug 2011) Log Message: --- force QUnit charset to UTF-8 Modified Paths: -- trunk/phase3/tests/qunit/index.html Modified: trunk/phase3/tests/qunit/index.html === --- trunk/phase3/tests/qunit/index.html 2011-08-16 08:31:51 UTC (rev 94613) +++ trunk/phase3/tests/qunit/index.html 2011-08-16 10:28:05 UTC (rev 94614) @@ -2,7 +2,7 @@ html head titleMediaWiki JavaScript Test Suite/title - + meta http-equiv=Content-Type content=text/html; charset=UTF-8 / !-- MediaWiki Modules -- !-- MW: startup -- ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94615] trunk/phase3/tests/qunit/suites/resources/jquery/jquery. highlightText.test.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94615
Revision: 94615
Author: hashar
Date: 2011-08-16 10:29:29 + (Tue, 16 Aug 2011)
Log Message:
---
correct number of tests fu r94609
Modified Paths:
--
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
Modified:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
===
---
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
2011-08-16 10:28:05 UTC (rev 94614)
+++
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
2011-08-16 10:29:29 UTC (rev 94615)
@@ -6,9 +6,9 @@
} );
test( 'Check', function() {
- expect(3);
+ expect(2);
var $fixture;
-
+
$fixture = $( 'pBlue Öyster Cult/p' );
$fixture.highlightText( 'Blue' );
equal(
@@ -26,7 +26,7 @@
/**
* Highlighter broken on punctuation mark.
*/
- /**
+ /** dont forget to update the value in expect() at the top!
$fixture = $( 'pSo good. To be there/p' );
$fixture.highlightText( 'good' );
equal(
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94617] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_QueryUIHelper.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94617
Revision: 94617
Author: devayon
Date: 2011-08-16 10:47:15 + (Tue, 16 Aug 2011)
Log Message:
---
minor cleanup
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 10:46:05 UTC (rev 94616)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 10:47:15 UTC (rev 94617)
@@ -341,7 +341,6 @@
*
* @global OutputPage $wgOut
* @global string $smwgScriptPath
-* @param string $errors
* @return string
*/
protected function getQueryFormBox() {
@@ -405,7 +404,7 @@
if ( !$smwgQSortingSupport ) return array();
$params = array();
- //loading all values from form
+ // loading all values from form
$orderValues = $wgRequest-getArray( 'order' );
$propertyValues = $wgRequest-getArray( 'property' );
$propertyLabelValues = $wgRequest-getArray( 'prop_label' );
@@ -680,7 +679,7 @@
$result .= Html::openElement( 'div', array(
'id' = sort_div_$i, 'class' = 'smwsort' ) );
$result .= 'span class=smwquisortlabelspan
class=smw-removea href=javascript:removePOInstance(\'sort_div_' . $i .
'\')img src=' . $smwgScriptPath . '/skins/images/close-button.png alt=' .
wfMsg( 'smw_qui_delete' ) . '/a/span';
$result .= wfMsg( 'smw_qui_property' ) .
'/span';
- $result .= Html::input( 'property[' . $i . ']',
$propertyValues[$key], 'text', array( 'size' = '35', 'id' = property$i ) )
. \n;
+ $result .= Html::input( 'property[' . $i . ']',
$propertyValues[$key], 'text', array( 'size' = '25', 'id' = property$i ) )
. \n;
$result .= Html::openElement( 'select', array(
'name' = order[$i] ) );
$if1 = ( !is_array( $orderValues ) ||
!array_key_exists( $key, $orderValues ) || $orderValues[$key] == 'NONE' );
@@ -1127,7 +1126,7 @@
foreach ( $orders as $i = $order ) {
$result .= div id=\sort_div_$i\ . wfMsg(
'smw_ask_sortby' ) . ' input type=text name=sort[' . $i . '] value=' .
- htmlspecialchars( $sorts[$i] ) . \
size=\35\/\n . 'select name=order[' . $i . ']option ';
+ htmlspecialchars( $sorts[$i] ) . \
size=\25\/\n . 'select name=order[' . $i . ']option ';
if ( $order == 'ASC' ) $result .=
'selected=selected ';
$result .= 'value=ASC' . wfMsg( 'smw_qui_ascorder'
) . '/optionoption ';
if ( $order == 'DESC' ) $result .=
'selected=selected ';
@@ -1137,7 +1136,7 @@
$result .= /div\n;
}
- $hidden .= 'div id=sorting_starter style=display: none'
. wfMsg( 'smw_ask_sortby' ) . ' input type=text size=35 /' . \n;
+ $hidden .= 'div id=sorting_starter style=display: none'
. wfMsg( 'smw_ask_sortby' ) . ' input type=text size=25 /' . \n;
$hidden .= ' select name=order_num' . \n;
$hidden .= 'option value=ASC' . wfMsg(
'smw_qui_ascorder' ) . /option\n;
$hidden .= 'option value=DESC' . wfMsg(
'smw_qui_descorder' ) . /option\n/select\n;
@@ -1571,7 +1570,7 @@
*
* Required by getFormatSelectBox() to recieve form elements from the
Web.
* UIs may need to overload processFormatOptions(),
-* getgetFormatSelectBox() and getFormatSelectBox() to change behavior.
+* processFormatSelectBox() and getFormatSelectBox() to change behavior.
*
* @param WebRequest $wgRequest
* @return boolean true if format options were requested and returned,
else false
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94618] trunk/extensions/CreateBox/CreateBox.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94618
Revision: 94618
Author: catrope
Date: 2011-08-16 10:57:56 + (Tue, 16 Aug 2011)
Log Message:
---
Fix XSS in CreateBox. Patch by Mark Goodwin from Mozilla.
Modified Paths:
--
trunk/extensions/CreateBox/CreateBox.php
Modified: trunk/extensions/CreateBox/CreateBox.php
===
--- trunk/extensions/CreateBox/CreateBox.php2011-08-16 10:47:15 UTC (rev
94617)
+++ trunk/extensions/CreateBox/CreateBox.php2011-08-16 10:57:56 UTC (rev
94618)
@@ -96,9 +96,9 @@
function acMakeBox( $input, $argv, $parser ) {
global $wgRequest, $wgScript;
if( $wgRequest-getVal( 'action' ) == 'create' ) {
- $prefix = $wgRequest-getVal( 'prefix' );
- $preload = $wgRequest-getVal( 'preload' );
- $editintro = $wgRequest-getVal( 'editintro' );
+ $prefix = acGetOption( $input, 'prefix' );
+ $preload = acGetOption( $input, 'preload' );
+ $editintro = acGetOption( $input, 'editintro' );
$text = $parser-getTitle()-getPrefixedText();
if( $prefix strpos( $text, $prefix ) === 0 ) {
$text = substr( $text, strlen( $prefix ) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94619] trunk/phase3/includes/SpecialPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94619
Revision: 94619
Author: ialex
Date: 2011-08-16 11:05:19 + (Tue, 16 Aug 2011)
Log Message:
---
Per Reedy, follow-up r93758: SpecialPage::capturePath() now has incorrect
signature. Removed the function rather than updating it, since it's not called
at all and current behavior is incompatible with the old one.
Modified Paths:
--
trunk/phase3/includes/SpecialPage.php
Modified: trunk/phase3/includes/SpecialPage.php
===
--- trunk/phase3/includes/SpecialPage.php 2011-08-16 10:57:56 UTC (rev
94618)
+++ trunk/phase3/includes/SpecialPage.php 2011-08-16 11:05:19 UTC (rev
94619)
@@ -236,19 +236,6 @@
}
/**
-* Just like executePath() except it returns the HTML instead of
outputting it
-* Returns false if there was no such special page, or a title object
if it was
-* a redirect.
-*
-* @param $title Title
-* @return String: HTML fragment
-* @deprecated since 1.18 call SpecialPageFactory method directly
-*/
- static function capturePath( $title ) {
- return SpecialPageFactory::capturePath( $title );
- }
-
- /**
* Get the local name for a specified canonical name
*
* @param $name String
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94621] trunk/extensions/QPoll/i18n/qp.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94621
Revision: 94621
Author: siebrand
Date: 2011-08-16 11:27:55 + (Tue, 16 Aug 2011)
Log Message:
---
Update punctuation for error messages.
Modified Paths:
--
trunk/extensions/QPoll/i18n/qp.i18n.php
Modified: trunk/extensions/QPoll/i18n/qp.i18n.php
===
--- trunk/extensions/QPoll/i18n/qp.i18n.php 2011-08-16 11:24:47 UTC (rev
94620)
+++ trunk/extensions/QPoll/i18n/qp.i18n.php 2011-08-16 11:27:55 UTC (rev
94621)
@@ -80,60 +80,60 @@
'qp_results_interpretation_header' = 'Answer interpretation',
'qp_results_short_interpretation' = 'Short interpretation: $1',
'qp_results_long_interpretation' = 'Long interpretation: $1',
- 'qp_poll_has_no_interpretation' = 'This poll has no interpretation
template defined in the poll\'s header',
+ 'qp_poll_has_no_interpretation' = 'This poll has no interpretation
template defined in the poll\'s header.',
'qp_interpetation_wrong_answer' = 'Wrong answer',
'qp_export_to_xls' = 'Export statistics into XLS format',
'qp_voices_to_xls' = 'Export voices into XLS format',
'qp_users_answered_questions' = '$1 {{PLURAL:$1|user|users}} answered
to the questions',
'qp_func_no_such_poll' = 'No such poll ($1)',
- 'qp_func_missing_question_id' = 'Please specify an existing question
id (starting from 1) for the poll $1',
- 'qp_func_invalid_question_id' = 'Invalid question id=$2 (not a number)
for the poll $1',
- 'qp_func_missing_proposal_id' = 'Please specify an existing proposal
id (starting from 0) for the poll $1, question $2',
- 'qp_func_invalid_proposal_id' = 'Invalid proposal id=$3 (not a number)
for the poll $1, question $2',
+ 'qp_func_missing_question_id' = 'Please specify an existing question
id (starting from 1) for the poll $1.',
+ 'qp_func_invalid_question_id' = 'Invalid question id=$2 (not a number)
for the poll $1.',
+ 'qp_func_missing_proposal_id' = 'Please specify an existing proposal
id (starting from 0) for the poll $1, question $2.',
+ 'qp_func_invalid_proposal_id' = 'Invalid proposal id=$3 (not a number)
for the poll $1, question $2.',
'qp_error_no_such_poll' = 'No such poll ($1).
-Make sure that the poll declared and saved, also be sure to use address
delimiter character #',
- 'qp_error_in_question_header' = 'Invalid question header: $1',
- 'qp_error_id_in_stats_mode' = 'Cannot declare an ID of the poll in
statistical mode',
- 'qp_error_dependance_in_stats_mode' = 'Cannot declare dependance chain
of the poll in statistical mode',
- 'qp_error_no_stats' = 'No statistical data is available, because no
one has voted for this poll, yet (address=$1)',
- 'qp_error_address_in_decl_mode' = 'Cannot get an address of the poll
in declaration mode',
- 'qp_error_question_not_implemented' = 'Questions of such type are not
implemented: $1',
- 'qp_error_invalid_question_type' = 'Invalid question type: $1',
- 'qp_error_type_in_stats_mode' = 'Question type cannot be defined in
statistical display mode: $1',
+Make sure that the poll declared and saved, also be sure to use address
delimiter character #.',
+ 'qp_error_in_question_header' = 'Invalid question header: $1.',
+ 'qp_error_id_in_stats_mode' = 'Cannot declare an ID of the poll in
statistical mode.',
+ 'qp_error_dependance_in_stats_mode' = 'Cannot declare dependance chain
of the poll in statistical mode.',
+ 'qp_error_no_stats' = 'No statistical data is available, because no
one has voted for this poll, yet (address=$1).',
+ 'qp_error_address_in_decl_mode' = 'Cannot get an address of the poll
in declaration mode.',
+ 'qp_error_question_not_implemented' = 'Questions of such type are not
implemented: $1.',
+ 'qp_error_invalid_question_type' = 'Invalid question type: $1.',
+ 'qp_error_type_in_stats_mode' = 'Question type cannot be defined in
statistical display mode: $1.',
'qp_error_no_poll_id' = 'Poll tag has no id attribute defined.',
'qp_error_invalid_poll_id' = 'Invalid poll id (id=$1).
-Poll id may contain only letters, numbers and space character',
+Poll id may contain only letters, numbers and space character.',
'qp_error_already_used_poll_id' = 'The poll id has already been used
on this page (id=$1).',
- 'qp_error_invalid_dependance_value' = 'The poll (id=$1) dependance
chain has invalid value of dependance attribute (dependance=$2)',
+ 'qp_error_invalid_dependance_value' = 'The poll (id=$1) dependance
chain has invalid value of dependance attribute (dependance=$2).',
'qp_error_missed_dependance_title' = 'The poll (id=$1) is dependant on
the another poll (id=$3) from page [[$2]], but the title [[$2]] was not found.
-Either remove the dependance attribute, or restore [[$2]]',
[MediaWiki-CVS] SVN: [94622] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94622 Revision: 94622 Author: siebrand Date: 2011-08-16 11:33:52 + (Tue, 16 Aug 2011) Log Message: --- Move magic i18n to its own file. Translate extension cannot handle messages and magic in the same file. Update Translate config accordingly. Modified Paths: -- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php trunk/extensions/SemanticSignup/SemanticSignup.php trunk/extensions/Translate/groups/mediawiki-defines.txt Added Paths: --- trunk/extensions/SemanticSignup/SemanticSignup.i18n.magic.php Added: trunk/extensions/SemanticSignup/SemanticSignup.i18n.magic.php === --- trunk/extensions/SemanticSignup/SemanticSignup.i18n.magic.php (rev 0) +++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.magic.php 2011-08-16 11:33:52 UTC (rev 94622) @@ -0,0 +1,19 @@ +?php +/** + * /** + * Internationalization file for the SemanticSignup extension. + * Created on 7 Jan 2008 + * + * @file SemanticSignup.magic.php + * @ingroup SemanticSignup + * + * @author Serhii Kutnii + * @author Jeroen De Dauw jeroended...@gmail.com + */ + +$magicWords = array(); + +/** English (English) */ +$magicWords['en'] = array( + 'signupfields' = array( 0, 'signupfields' ), +); Property changes on: trunk/extensions/SemanticSignup/SemanticSignup.i18n.magic.php ___ Added: svn:keywords + Id Added: svn:eol-style + native Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.php === --- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 11:27:55 UTC (rev 94621) +++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 11:33:52 UTC (rev 94622) @@ -1,5 +1,4 @@ ?php - /** * /** * Internationalization file for the SemanticSignup extension. @@ -26,10 +25,3 @@ 'ses-throttlehit' = 'New user accounts number maximum per day has been exceeded for this IP.', 'ses-userexists' = 'User already exists.' ); - -$magicWords = array(); - -/** English (English) */ -$magicWords['en'] = array( - 'signupfields' = array( 0, 'signupfields' ), -); Modified: trunk/extensions/SemanticSignup/SemanticSignup.php === --- trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 11:27:55 UTC (rev 94621) +++ trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 11:33:52 UTC (rev 94622) @@ -1,5 +1,4 @@ ?php - /** * Initialization file for the Semantic Signup extension. * @@ -41,7 +40,7 @@ die( 'bError:/b You need to have a href=http://semantic-mediawiki.org/wiki/Semantic_Forms;Semantic Forms/a installed in order to use SemanticSignup.' ); } -define( 'SemanticSignup_VERSION', '0.4 alpha' ); +define( 'SemanticSignup_VERSION', '0.4.1 alpha' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( 'path' = __FILE__, @@ -56,6 +55,7 @@ ); $wgExtensionMessagesFiles['SemanticSignup'] = dirname( __FILE__ ) . '/SemanticSignup.i18n.php'; +$wgExtensionMessagesFiles['SemanticSignupMagic'] = dirname( __FILE__ ) . '/SemanticSignup.i18n.magic.php'; $wgExtensionAliasesFiles['SemanticSignup'] = dirname( __FILE__ ) . '/SemanticSignup.i18n.aliases.php'; $wgAutoloadClasses['SemanticSignupSettings'] = dirname( __FILE__ ) . '/SemanticSignup.settings.php'; Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt === --- trunk/extensions/Translate/groups/mediawiki-defines.txt 2011-08-16 11:27:55 UTC (rev 94621) +++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2011-08-16 11:33:52 UTC (rev 94622) @@ -1424,6 +1424,7 @@ SemanticSignup aliasfile = SemanticSignup.i18n.aliases.php +magicfile = SemanticSignup.i18n.magic.php Semantic Tasks ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94623] trunk/extensions/QPoll/i18n/qp.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94623 Revision: 94623 Author: siebrand Date: 2011-08-16 11:45:18 + (Tue, 16 Aug 2011) Log Message: --- Fix a few typos in messages. Modified Paths: -- trunk/extensions/QPoll/i18n/qp.i18n.php Modified: trunk/extensions/QPoll/i18n/qp.i18n.php === --- trunk/extensions/QPoll/i18n/qp.i18n.php 2011-08-16 11:33:52 UTC (rev 94622) +++ trunk/extensions/QPoll/i18n/qp.i18n.php 2011-08-16 11:45:18 UTC (rev 94623) @@ -132,8 +132,8 @@ 'qp_error_eval_variable_variable_access' = 'PHP token $1 with variable variable $2 is not allowed in line $3.', 'qp_error_eval_illegal_variable_name' = 'PHP token $1 has disallowed variable name $2 in line $3.', 'qp_error_eval_variable_function_call' = 'PHP token $1 with variable function $2 is not allowed in line $3.', - 'qp_error_eval_self_check' = 'The following eval() self-check was failed: $1. You have unsupported version of PHP, which does not allow to run eval scripts securely.', - 'qp_error_eval_unable_to_lint' = 'Unable to lint (check your system configuration).', + 'qp_error_eval_self_check' = 'The following eval() self-check has failed: $1. You have unsupported version of PHP, which does not allow to run eval scripts securely.', + 'qp_error_eval_unable_to_lint' = 'Unable to lint. Check your system configuration.', ); /** Message documentation (Message documentation) ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94624] trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94624 Revision: 94624 Author: siebrand Date: 2011-08-16 12:27:33 + (Tue, 16 Aug 2011) Log Message: --- email - e-mail. Modified Paths: -- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.php === --- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 11:45:18 UTC (rev 94623) +++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 12:27:33 UTC (rev 94624) @@ -20,7 +20,7 @@ 'ses-nopwdmatch' = 'Password and password confirmation do not match.', 'ses-norealname' = 'Real name is required but has not been specified.', 'ses-userexists' = 'User already exists.', - 'ses-emailfailed' = 'Confirmation email sending failed.', + 'ses-emailfailed' = 'Confirmation e-mail sending failed.', 'ses-createforbidden' = 'Current user is not allowed to create accounts.', 'ses-throttlehit' = 'New user accounts number maximum per day has been exceeded for this IP.', 'ses-userexists' = 'User already exists.' ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94625] trunk/extensions/SemanticSignup/SemanticSignup.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94625 Revision: 94625 Author: siebrand Date: 2011-08-16 12:29:26 + (Tue, 16 Aug 2011) Log Message: --- IP - IP address. Modified Paths: -- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php Modified: trunk/extensions/SemanticSignup/SemanticSignup.i18n.php === --- trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 12:27:33 UTC (rev 94624) +++ trunk/extensions/SemanticSignup/SemanticSignup.i18n.php 2011-08-16 12:29:26 UTC (rev 94625) @@ -22,6 +22,6 @@ 'ses-userexists' = 'User already exists.', 'ses-emailfailed' = 'Confirmation e-mail sending failed.', 'ses-createforbidden' = 'Current user is not allowed to create accounts.', - 'ses-throttlehit' = 'New user accounts number maximum per day has been exceeded for this IP.', + 'ses-throttlehit' = 'New user accounts number maximum per day has been exceeded for this IP address.', 'ses-userexists' = 'User already exists.' ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94626] trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94626
Revision: 94626
Author: siebrand
Date: 2011-08-16 12:32:43 + (Tue, 16 Aug 2011)
Log Message:
---
Add !semantic to avoid confusion with the regular watchlist.
Modified Paths:
--
trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
Modified: trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
===
--- trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
2011-08-16 12:29:26 UTC (rev 94625)
+++ trunk/extensions/SemanticWatchlist/SemanticWatchlist.i18n.php
2011-08-16 12:32:43 UTC (rev 94626)
@@ -55,7 +55,7 @@
'swl-watchlist-pagincontrol' = 'View ($1) ($2)',
'swl-watchlist-firstn' = 'first $1',
'swl-watchlist-firstn-title' = 'First $1 {{PLURAL:$1|result|results}}',
- 'swl-watchlist-no-items' = 'You have no items on your watchlist.',
+ 'swl-watchlist-no-items' = 'You have no items on your semantic
watchlist.',
'swl-watchlist-can-mod-groups' = 'You can [[$1|modify the watchlist
groups]].',
'swl-watchlist-can-mod-prefs' = 'You can [[$1|modify your watchlist
preferences]], including setting which properties to watch.',
'swl-watchlist-no-groups' = 'You are not yet watching any watchlist
groups. [[$1|Modify your watchlist preferences]].',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94627] trunk/extensions/UploadWizard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94627
Revision: 94627
Author: j
Date: 2011-08-16 12:33:13 + (Tue, 16 Aug 2011)
Log Message:
---
Add FormData upload transport.
If enabled this is used in Browsers that support FormData.
Larger files are uploaded in chunks.
Modified Paths:
--
trunk/extensions/UploadWizard/UploadWizard.config.php
trunk/extensions/UploadWizard/UploadWizardHooks.php
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
Added Paths:
---
trunk/extensions/UploadWizard/resources/mw.ApiUploadFormDataHandler.js
trunk/extensions/UploadWizard/resources/mw.FormDataTransport.js
Modified: trunk/extensions/UploadWizard/UploadWizard.config.php
===
--- trunk/extensions/UploadWizard/UploadWizard.config.php 2011-08-16
12:32:43 UTC (rev 94626)
+++ trunk/extensions/UploadWizard/UploadWizard.config.php 2011-08-16
12:33:13 UTC (rev 94627)
@@ -287,6 +287,9 @@
// supports passthrough mode so that assets that don't
need conversions behave very similar
// to a normal XHR post.
'enableFirefogg' = false,
+
+ // Check if we want to enable FormData upload
+ 'enableFormData' = false,
// Setup list of video extensions for recomending firefogg.
'transcodeExtensionList' = array(
'avi','asf','asx','wmv','wmx','dv','rm','ra','3gp','mkv',
Modified: trunk/extensions/UploadWizard/UploadWizardHooks.php
===
--- trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-08-16 12:32:43 UTC
(rev 94626)
+++ trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-08-16 12:33:13 UTC
(rev 94627)
@@ -76,7 +76,11 @@
'resources/mw.Firefogg.js',
'resources/mw.FirefoggHandler.js',
'resources/mw.FirefoggTransport.js',
-
+
+ //upload using FormData, large files in chunks
+ 'resources/mw.FormDataTransport.js',
+ 'resources/mw.ApiUploadFormDataHandler.js',
+
// interface libraries
'resources/mw.GroupProgressBar.js',
Added: trunk/extensions/UploadWizard/resources/mw.ApiUploadFormDataHandler.js
===
--- trunk/extensions/UploadWizard/resources/mw.ApiUploadFormDataHandler.js
(rev 0)
+++ trunk/extensions/UploadWizard/resources/mw.ApiUploadFormDataHandler.js
2011-08-16 12:33:13 UTC (rev 94627)
@@ -0,0 +1,67 @@
+/**
+ * Represents an object which configures an html5 FormData object to upload.
+ * Large files are uploaded in chunks.
+ * @param an UploadInterface object, which contains a .form property which
points to a real HTML form in the DOM
+ */
+mw.ApiUploadFormDataHandler = function( upload, api ) {
+this.upload = upload;
+this.api = api;
+this.$form = $j( this.upload.ui.form );
+this.formData = {
+action: 'upload',
+stash: 1,
+format: 'json'
+};
+
+var _this = this;
+this.transport = new mw.FormDataTransport(
+this.$form,
+this.formData,
+function( fraction ) {
+_this.upload.setTransportProgress( fraction );
+},
+function( result ) {
+_this.upload.setTransported( result );
+}
+);
+
+};
+
+mw.ApiUploadFormDataHandler.prototype = {
+/**
+ * Optain a fresh edit token.
+ * If successful, store token and call a callback.
+ * @param ok callback on success
+ * @param err callback on error
+ */
+configureEditToken: function( callerOk, err ) {
+var _this = this;
+
+var ok = function( token ) {
+_this.formData.token = token;
+callerOk();
+};
+
+_this.api.getEditToken( ok, err );
+},
+
+/**
+ * Kick off the upload!
+ */
+start: function() {
+var _this = this;
+var ok = function() {
+_this.beginTime = ( new Date() ).getTime();
+_this.upload.ui.setStatus( 'mwe-upwiz-transport-started' );
+_this.upload.ui.showTransportProgress();
+_this.transport.upload();
+};
+var err = function( code, info ) {
+_this.upload.setError( code, info );
+};
+this.configureEditToken( ok, err );
+}
+};
+
+
+
Added: trunk/extensions/UploadWizard/resources/mw.FormDataTransport.js
===
--- trunk/extensions/UploadWizard/resources/mw.FormDataTransport.js
(rev 0)
+++ trunk/extensions/UploadWizard/resources/mw.FormDataTransport.js
2011-08-16 12:33:13 UTC (rev
[MediaWiki-CVS] SVN: [94628] trunk/extensions/SignupAPI/SignupAPI.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94628 Revision: 94628 Author: siebrand Date: 2011-08-16 12:38:53 + (Tue, 16 Aug 2011) Log Message: --- Add link to special page. Modified Paths: -- trunk/extensions/SignupAPI/SignupAPI.i18n.php Modified: trunk/extensions/SignupAPI/SignupAPI.i18n.php === --- trunk/extensions/SignupAPI/SignupAPI.i18n.php 2011-08-16 12:33:13 UTC (rev 94627) +++ trunk/extensions/SignupAPI/SignupAPI.i18n.php 2011-08-16 12:38:53 UTC (rev 94628) @@ -9,7 +9,7 @@ $messages = array(); $messages['en'] = array( - 'signupapi-desc' = 'Cleans up Special:UserLogin from signup related stuff adds an API for signup', + 'signupapi-desc' = 'Cleans up the [[Special:UserLogin|login page]] from signup related stuff and adds an API for signup', ); /** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца)) ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94629] trunk/phase3/includes/api/ApiWatch.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94629
Revision: 94629
Author: catrope
Date: 2011-08-16 12:46:15 + (Tue, 16 Aug 2011)
Log Message:
---
Followup r90041: keep naming of watch and unwatch calls consistent
Modified Paths:
--
trunk/phase3/includes/api/ApiWatch.php
Modified: trunk/phase3/includes/api/ApiWatch.php
===
--- trunk/phase3/includes/api/ApiWatch.php 2011-08-16 12:38:53 UTC (rev
94628)
+++ trunk/phase3/includes/api/ApiWatch.php 2011-08-16 12:46:15 UTC (rev
94629)
@@ -59,11 +59,11 @@
if ( $params['unwatch'] ) {
$res['unwatched'] = '';
$res['message'] = wfMsgExt( 'removedwatchtext', array(
'parse' ), $title-getPrefixedText() );
- $success = WatchAction::doUnwatch( $title, $wgUser );
+ $success = UnwatchAction::doUnwatch( $title, $wgUser );
} else {
$res['watched'] = '';
$res['message'] = wfMsgExt( 'addedwatchtext', array(
'parse' ), $title-getPrefixedText() );
- $success = UnwatchAction::doWatch( $title, $wgUser );
+ $success = WatchAction::doWatch( $title, $wgUser );
}
if ( !$success ) {
$this-dieUsageMsg( 'hookaborted' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94630] trunk/phase3/includes/actions/WatchAction.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94630
Revision: 94630
Author: catrope
Date: 2011-08-16 12:48:05 + (Tue, 16 Aug 2011)
Log Message:
---
Followup r89545: add ,0 to Article constructor call
Modified Paths:
--
trunk/phase3/includes/actions/WatchAction.php
Modified: trunk/phase3/includes/actions/WatchAction.php
===
--- trunk/phase3/includes/actions/WatchAction.php 2011-08-16 12:46:15 UTC
(rev 94629)
+++ trunk/phase3/includes/actions/WatchAction.php 2011-08-16 12:48:05 UTC
(rev 94630)
@@ -87,7 +87,7 @@
}
public static function doWatch( Title $title, User $user ) {
- $page = new Article( $title );
+ $page = new Article( $title, 0 );
if ( wfRunHooks( 'WatchArticle', array( $user, $page ) ) ) {
$user-addWatch( $title );
@@ -97,7 +97,7 @@
}
public static function doUnwatch( Title $title, User $user ) {
- $page = new Article( $title );
+ $page = new Article( $title, 0 );
if ( wfRunHooks( 'UnwatchArticle', array( $user, $page ) ) ) {
$user-removeWatch( $title );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94631] trunk/extensions/SocialProfile/SystemGifts/SystemGift.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94631
Revision: 94631
Author: siebrand
Date: 2011-08-16 12:54:03 + (Tue, 16 Aug 2011)
Log Message:
---
Follow-up r92631: correct plural.
Modified Paths:
--
trunk/extensions/SocialProfile/SystemGifts/SystemGift.i18n.php
Modified: trunk/extensions/SocialProfile/SystemGifts/SystemGift.i18n.php
===
--- trunk/extensions/SocialProfile/SystemGifts/SystemGift.i18n.php
2011-08-16 12:48:05 UTC (rev 94630)
+++ trunk/extensions/SocialProfile/SystemGifts/SystemGift.i18n.php
2011-08-16 12:54:03 UTC (rev 94631)
@@ -72,8 +72,8 @@
'topawards-edit-milestone' = '{{PLURAL:$1|$1 Edit|$1 Edits}}
Milestone',
'topawards-vote-milestone' = '{{PLURAL:$1|$1 Vote|$1 Votes}}
Milestone',
'topawards-comment-milestone' = '{{PLURAL:$1|$1 Comment|$1 Comments}}
Milestone',
- 'topawards-recruit-milestone' = '{{PLURAL:$1|$1 Recruit|$1 Recruit}}
Milestone',
- 'topawards-friend-milestone' = '{{PLURAL:$1|$1 Friend|$1 Friend}}
Milestone',
+ 'topawards-recruit-milestone' = '{{PLURAL:$1|$1 Recruit|$1 Recruits}}
Milestone',
+ 'topawards-friend-milestone' = '{{PLURAL:$1|$1 Friend|$1 Friends}}
Milestone',
'topawards-empty' = 'Either there are no configured awards for this
award category, or then nobody has gotten those awards yet.',
'system_gift_received_subject' = 'You have received the $1 award on
{{SITENAME}}!',
'system_gift_received_body' = 'Hi $1.
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94632] trunk/extensions/SocialProfile/UserStats
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94632
Revision: 94632
Author: siebrand
Date: 2011-08-16 13:01:52 + (Tue, 16 Aug 2011)
Log Message:
---
Add plural support.
Modified Paths:
--
trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php
Modified: trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
===
--- trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
2011-08-16 12:54:03 UTC (rev 94631)
+++ trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
2011-08-16 13:01:52 UTC (rev 94632)
@@ -212,8 +212,9 @@
foreach( $users as $user ) {
$userTitle = Title::makeTitle( NS_USER,
$user['user_name'] );
- $pageContent .= wfMsgForContent(
+ $pageContent .= wfMsgExt(
'user-stats-report-row',
+ array( 'content', 'parsemag' ),
$user['rank'],
$user['user_name'],
$wgContLang-formatNum( $user['points'] )
@@ -224,8 +225,9 @@
$userTitle-getFullURL() . ' .
$user['user_name'] . /a
/span;
- $out .= 'span class=top-fan-points' . wfMsgWikiHtml(
+ $out .= 'span class=top-fan-points' . wfMsgExt(
'user-stats-report-points',
+ array( 'content', 'parsemag' ),
$wgContLang-formatNum( $user['points'] )
) . '/span
/div';
Modified: trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php
===
--- trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php 2011-08-16
12:54:03 UTC (rev 94631)
+++ trunk/extensions/SocialProfile/UserStats/UserStats.i18n.php 2011-08-16
13:01:52 UTC (rev 94632)
@@ -76,11 +76,11 @@
'generatetopusersreport' = 'Generate Top Users Report',
'user-stats-weekly-winners' = 'Weekly {{PLURAL:$1|Winner|Winners}}',
'user-stats-monthly-winners' = 'Monthly {{PLURAL:$1|Winner|Winners}}',
- 'user-stats-weekly-win-congratulations' = 'Congratulations to the
following {{PLURAL:$1|user|users}}, who earned a weekly win and $2 extra
points!',
- 'user-stats-monthly-win-congratulations' = 'Congratulations to the
following {{PLURAL:$1|user|users}}, who earned a monthly win and $2 extra
points!',
+ 'user-stats-weekly-win-congratulations' = 'Congratulations to the
following {{PLURAL:$1|user|users}}, who earned a weekly win and $2 extra
{{PLURAL:$2|point|points}}!',
+ 'user-stats-monthly-win-congratulations' = 'Congratulations to the
following {{PLURAL:$1|user|users}}, who earned a monthly win and $2 extra
{{PLURAL:$2|point|points}}!',
'user-stats-full-top' = 'Full Top $1',
- 'user-stats-report-row' = ($1) [[User:$2|$2]] - '''$3''' points,
- 'user-stats-report-points' = '''$1''' points,
+ 'user-stats-report-row' = ($1) [[User:$2|$2]] - '''$3'''
{{PLURAL:$3|point|points}}!,
+ 'user-stats-report-points' = '''$1''' {{PLURAL:$1|point|points}}!,
'user-stats-report-generation-note' = 'this page was generated
automatically',
'user-stats-report-weekly-edit-summary' = 'automated weekly user
report',
'user-stats-report-monthly-edit-summary' = 'automated monthly user
report',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94633] trunk/extensions/SocialProfile/UserStats/ GenerateTopUsersReport.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94633
Revision: 94633
Author: siebrand
Date: 2011-08-16 13:12:26 + (Tue, 16 Aug 2011)
Log Message:
---
Localise numbers.
Modified Paths:
--
trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
Modified: trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
===
--- trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
2011-08-16 13:01:52 UTC (rev 94632)
+++ trunk/extensions/SocialProfile/UserStats/GenerateTopUsersReport.php
2011-08-16 13:12:26 UTC (rev 94633)
@@ -208,14 +208,14 @@
) . \n\n;
$pageContent .= =={$winners}==\n\nbr /\n;
- $pageContent .= '==' . wfMsgForContent( 'user-stats-full-top',
$user_count ) . ==\n\n;
+ $pageContent .= '==' . wfMsgForContent( 'user-stats-full-top',
$wgContLang-formatNum( $user_count ) ) . ==\n\n;
foreach( $users as $user ) {
$userTitle = Title::makeTitle( NS_USER,
$user['user_name'] );
$pageContent .= wfMsgExt(
'user-stats-report-row',
array( 'content', 'parsemag' ),
- $user['rank'],
+ $wgContLang-formatNum( $user['rank'] ),
$user['user_name'],
$wgContLang-formatNum( $user['points'] )
) . \n\n;
@@ -285,4 +285,4 @@
$out .= '/div'; // .top-users
$wgOut-addHTML( $out );
}
-}
\ No newline at end of file
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94634] trunk/extensions/SemanticMediaWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94634
Revision: 94634
Author: devayon
Date: 2011-08-16 13:21:43 + (Tue, 16 Aug 2011)
Log Message:
---
initial work for adding seperate controls for default, intro and outro
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
Modified: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
===
--- trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-08-16 13:12:26 UTC (rev 94633)
+++ trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-08-16 13:21:43 UTC (rev 94634)
@@ -227,7 +227,7 @@
'smw_ask_queryhead' = 'Query',
'smw_ask_printhead' = 'Additional data to display',
'smw_ask_printdesc' = '(add one property name per line)',
- 'smw_ask_format_as' = 'Format as:',
+ 'smw_ask_format_as' = 'Format as:',
'smw_ask_defaultformat' = 'default',
'smw_ask_otheroptions' = 'Other options',
'smw_ask_show_embed'= 'Show embed code',
@@ -240,6 +240,8 @@
'smw_qc_addmainlabel' = 'Add main label',
'smw_qc_show_addnal_opts' = 'Show more options',
'smw_qc_hide_addnal_opts' = 'Show less options',
+ 'smw_qc_otheropt' = 'Other options',
+ 'smw_qc_formatopt' = 'Format options',
'smw_qc_query_help'= 'Enter a query using the form below.
Select wiki pages based on
Categories (strong[[{{ns:category}}:Actor]]/strong),
Properties (strong[[Located in::Germany]]/strong),
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 13:12:26 UTC (rev 94633)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 13:21:43 UTC (rev 94634)
@@ -1515,9 +1515,7 @@
$result[0] .= /select;
$result[0] .= \n;
- $result[] .= 'fieldsetlegend' . wfMsg(
'smw_ask_otheroptions' ) . /legend\n;
- $result[1] .= div id=\other_options\ .
$this-showFormatOptions( $params['format'], $params ) . /div;
- $result[1] .= /fieldset\n;
+ $result[] .= 'div id=other_options ' .
$this-showFormatOptions( $params['format'], $params ) . ' /div';
// BEGIN: add javascript for updating formating options by ajax
$javascript = END
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
2011-08-16 13:12:26 UTC (rev 94633)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
2011-08-16 13:21:43 UTC (rev 94634)
@@ -177,7 +177,9 @@
* Overridden from parent to ignore GUI parameters 'format' 'limit' and
'offset'
*/
protected function showFormatOptions( $format, array $paramValues,
array $ignoredAttribs = array() ) {
- return parent::showFormatOptions( $format, $paramValues, array(
'format', 'limit', 'offset', 'mainlabel' ) );
+ return parent::showFormatOptions( $format, $paramValues, array(
+ 'format', 'limit', 'offset', 'mainlabel', 'intro',
'outro', 'default'
+ ) );
}
/**
* Creates the input form
@@ -218,7 +220,20 @@
// END: show|hide additional options
$result .= 'div id=additional_options style=display:none';
- $result .= $formatBox[1]; // display the format options
+ $result .= 'fieldsetlegend' . wfMsg( 'smw_ask_otheroptions'
) . /legend\n .
+ Html::rawElement( 'div', array( 'style'
= 'width: 30%; padding: 5px; float: left;' ),
+ 'Intro: input
name=p[intro] size=32/ br/' . wfMsg( 'smw_paramdesc_intro' )
+ ) .
+ Html::rawElement( 'div', array( 'style'
= 'width: 30%; padding: 5px; float: left;' ),
+ 'Outro: input
name=p[outro] size=32/ br/' . wfMsg( 'smw_paramdesc_outro' )
+ ) .
+ Html::rawElement( 'div', array( 'style'
= 'width: 30%; padding: 5px; float: left;' ),
+ 'Default: input
name=p[default]
[MediaWiki-CVS] SVN: [94635] trunk/extensions/UploadWizard/UploadWizard.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94635
Revision: 94635
Author: siebrand
Date: 2011-08-16 13:28:29 + (Tue, 16 Aug 2011)
Log Message:
---
Update punctuation.
Use capital after colon (US English)
Remove trailing whitespace in 'en'
Modified Paths:
--
trunk/extensions/UploadWizard/UploadWizard.i18n.php
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-08-16 13:21:43 UTC
(rev 94634)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-08-16 13:28:29 UTC
(rev 94635)
@@ -28,18 +28,18 @@
'mwe-upwiz-step-deeds' = 'Release rights', // Guillaume wants Set
rights. Disagreement -- NeilK
'mwe-upwiz-step-details' = 'Describe',
'mwe-upwiz-step-thanks' = 'Use',
- 'mwe-upwiz-api-error-http' = 'Internal error: unable to connect to
server.',
- 'mwe-upwiz-api-error-ok-but-empty' = 'Internal error: no response from
server.',
- 'mwe-upwiz-api-error-unclassified' = 'An unknown error occurred',
+ 'mwe-upwiz-api-error-http' = 'Internal error: Unable to connect to
server.',
+ 'mwe-upwiz-api-error-ok-but-empty' = 'Internal error: No response from
server.',
+ 'mwe-upwiz-api-error-unclassified' = 'An unknown error occurred.',
'mwe-upwiz-api-error-unknown-code' = 'Unknown error: $1',
'mwe-upwiz-api-error-uploaddisabled' = 'Uploading is disabled on this
wiki.',
- 'mwe-upwiz-api-error-nomodule' = 'Internal error: no upload module
set.',
- 'mwe-upwiz-api-error-mustbeposted' = 'Internal error: request requires
HTTP POST.',
+ 'mwe-upwiz-api-error-nomodule' = 'Internal error: No upload module
set.',
+ 'mwe-upwiz-api-error-mustbeposted' = 'Internal error: Request requires
HTTP POST.',
'mwe-upwiz-api-error-badaccess-groups' = 'You are not permitted to
upload files to this wiki.',
- 'mwe-upwiz-api-error-stashfailed' = 'Internal error: server failed to
store temporary file.',
- 'mwe-upwiz-api-error-missingresult' = 'Internal error: could not
determine if the copy succeeded.',
- 'mwe-upwiz-api-error-missingparam' = 'Internal error: missing
parameters on request.',
- 'mwe-upwiz-api-error-invalid-file-key' = 'Internal error: file was not
found in temporary storage.',
+ 'mwe-upwiz-api-error-stashfailed' = 'Internal error: Server failed to
store temporary file.',
+ 'mwe-upwiz-api-error-missingresult' = 'Internal error: Could not
determine if the copy succeeded.',
+ 'mwe-upwiz-api-error-missingparam' = 'Internal error: Missing
parameters on request.',
+ 'mwe-upwiz-api-error-invalid-file-key' = 'Internal error: File was not
found in temporary storage.',
'mwe-upwiz-api-error-copyuploaddisabled' = 'Uploading by URL is
disabled on this server.',
'mwe-upwiz-api-error-mustbeloggedin' = 'You must be logged in to
upload files.',
'mwe-upwiz-api-error-empty-file' = 'The file you submitted was empty.',
@@ -50,11 +50,11 @@
'mwe-upwiz-api-error-illegal-filename' = 'The filename is not
allowed.',
'mwe-upwiz-api-error-verification-error' = 'This file might be
corrupt, or have the wrong extension.',
'mwe-upwiz-api-error-hookaborted' = 'The modification you tried to
make was aborted by an extension hook.',
- 'mwe-upwiz-api-error-unknown-error' = 'Internal error: something went
wrong when trying to upload your file.',
- 'mwe-upwiz-api-error-internal-error' = 'Internal error: something went
wrong with processing your upload on the wiki.',
+ 'mwe-upwiz-api-error-unknown-error' = 'Internal error: Something went
wrong when trying to upload your file.',
+ 'mwe-upwiz-api-error-internal-error' = 'Internal error: Something went
wrong with processing your upload on the wiki.',
'mwe-upwiz-api-error-overwrite' = 'Overwriting an existing file is not
allowed.',
- 'mwe-upwiz-api-error-badtoken' = 'Internal error: bad token.',
- 'mwe-upwiz-api-error-fetchfileerror' = 'Internal error: something went
wrong while fetching the file.',
+ 'mwe-upwiz-api-error-badtoken' = 'Internal error: Bad token.',
+ 'mwe-upwiz-api-error-fetchfileerror' = 'Internal error: Something went
wrong while fetching the file.',
'mwe-upwiz-api-error-duplicate' = 'There {{PLURAL:$1|is [$2 another
file]|are [$2 some other files]}} already on the site with the same content.',
'mwe-upwiz-api-error-duplicate-popup-title' = 'Duplicate
{{PLURAL:$1|file|files}}',
'mwe-upwiz-api-error-duplicate-archive' = 'There {{PLURAL:$1|was [$2
another file]|were [$2 some other files]}} already on the site with the same
content, but {{PLURAL:$1|it was|they were}} deleted.',
@@ -62,8 +62,8 @@
'mwe-upwiz-api-error-unknown-warning' = 'Unknown warning: $1',
'mwe-upwiz-api-error-timeout' = 'The server did
[MediaWiki-CVS] SVN: [94636] trunk/phase3/resources/jquery/jquery.qunit.completenessTest.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94636
Revision: 94636
Author: catrope
Date: 2011-08-16 13:33:22 + (Tue, 16 Aug 2011)
Log Message:
---
Followup r89853, tweaks for jquery.qunit.completenessTest:
* Don't assume $ as a global, but alias it to jQuery instead. The code is
already wrapped in a closure so this is easy
* Remove unused constants TYPE_SIMPLEFUNC and TYPE_OBJCONSTRFUNC
* Fix spelling in comments, mostly brake-break
* Fix whitespace
* Kill useless return at the end of a void function
* Correct comment in hasTests() which claims the function does the opposite of
what it really does
Modified Paths:
--
trunk/phase3/resources/jquery/jquery.qunit.completenessTest.js
Modified: trunk/phase3/resources/jquery/jquery.qunit.completenessTest.js
===
--- trunk/phase3/resources/jquery/jquery.qunit.completenessTest.js
2011-08-16 13:28:29 UTC (rev 94635)
+++ trunk/phase3/resources/jquery/jquery.qunit.completenessTest.js
2011-08-16 13:33:22 UTC (rev 94636)
@@ -5,7 +5,7 @@
* libraries. Written to be used in enviroments with jQuery and QUnit.
* Requires jQuery 1.5.2 or higher.
*
- * Globals: jQuery, $, QUnit, console.log
+ * Globals: jQuery, QUnit, console.log
*
* Built for and tested with:
* - Safari 5
@@ -13,12 +13,8 @@
*
* @author Timo Tijhof, 2011
*/
-(function(){
+( function( $ ) {
-/* Private members */
-var TYPE_SIMPLEFUNC = 101;
-var TYPE_OBJCONSTRFUNC = 100;
-
/**
* CompletenessTest
* @constructor
@@ -159,7 +155,7 @@
$.each( currVar.prototype, function(
key, value ) {
if ( key === 'constructor' )
return;
- // Clone and brake reference to
parentPathArray
+ // Clone and break reference to
parentPathArray
var tmpPathArray = $.extend(
[], parentPathArray );
tmpPathArray.push( 'prototype'
); tmpPathArray.push( key );
@@ -174,12 +170,10 @@
if ( !currVar.prototype || $.isEmptyObject(
currVar.prototype ) ) {
// Inject check
- that.injectCheck( masterVariable,
parentPathArray, function(){
-
+ that.injectCheck( masterVariable,
parentPathArray, function() {
that.methodCallTracker[
parentPathArray.join( '.' ) ] = true;
+ } );
- }, TYPE_SIMPLEFUNC );
-
// We don't support checking object
constructors yet...
} else {
@@ -187,7 +181,7 @@
$.each( currVar.prototype, function(
key, value ) {
if ( key === 'constructor' )
return;
- // Clone and brake reference to
parentPathArray
+ // Clone and break reference to
parentPathArray
var tmpPathArray = $.extend(
[], parentPathArray );
tmpPathArray.push( 'prototype'
); tmpPathArray.push( key );
@@ -197,12 +191,12 @@
}
- // Recursively. After all, this *is* the completness test
+ // Recursively. After all, this *is* the completeness test
} else if ( type === 'object' ) {
$.each( currVar, function( key, value ) {
- // Clone and brake reference to parentPathArray
+ // Clone and break reference to parentPathArray
var tmpPathArray = $.extend( [],
parentPathArray );
tmpPathArray.push( key );
@@ -211,8 +205,6 @@
} );
}
-
- return 'End of checkTests';
},
/**
@@ -220,13 +212,13 @@
*
* Checks if the given method name (ie. 'my.foo.bar')
* was called during the test suite (as far as the tracker knows).
-* If so it adds it to missingTests.
+* If not it adds it to missingTests.
*
* @param fnName {String}
* @return {Boolean}
*/
hasTest: function( fnName ) {
- if ( !(fnName in this.methodCallTracker) ) {
+ if ( !( fnName in this.methodCallTracker ) ) {
this.missingTests[fnName] = true;
return false;
}
@@ -248,14 +240,14 @@
curr = masterVariable,
[MediaWiki-CVS] SVN: [94637] trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94637 Revision: 94637 Author: siebrand Date: 2011-08-16 13:35:44 + (Tue, 16 Aug 2011) Log Message: --- Fix typo. Modified Paths: -- trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php === --- trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php 2011-08-16 13:33:22 UTC (rev 94636) +++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php 2011-08-16 13:35:44 UTC (rev 94637) @@ -61,7 +61,7 @@ 'timedmedia-reset' = 'Reset transcode', 'timedmedia-reset-confirm' = 'Resetting this transcode, will remove any existing file (if present), and it will re-add the transcode to the job queue. It will take some time to re-transcode. br /br /' . 'Are you sure you want to proceed?', - 'timedmedia-reset-error'= 'Error in reseting transcode job', + 'timedmedia-reset-error'= 'Error in resetting transcode job.', // Original uploaded asset 'timedmedia-ogg' = 'Ogg', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94638] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94638
Revision: 94638
Author: hashar
Date: 2011-08-16 14:15:07 + (Tue, 16 Aug 2011)
Log Message:
---
Tests for wfGetIP() follow up r89407
* wfGetIP() now support resetting its internal static variable. Thanks to
Platonides which introduced this trick with r92960.
* Various tests for $_SERVER['REMOTE_ADDR'] and $wgCommandLineMode.
revert r94575:
- reenable testGetFromServerRemoteAddr() which was not an issue
reintroduce r94558:
- per CR on r94558 by Aaron use meaningful parameter to wfGetIP() when
resetting the static variable ( 'reset' instead of true).
- keep testLackOfRemoteAddrThrowAnException() test in the broken group
with a comment for later fixing.
TODO:
- implements tests for XFF headers.
TEST PLAN:
$ ./phpunit.php --filter wfGetIP --testdox
PHPUnit 3.5.14 by Sebastian Bergmann.
wfGetIP
[x] Get loopback address when in command line
[x] Get from server remote addr
[x] Lack of remote addr throw an exception
$
Modified Paths:
--
trunk/phase3/includes/ProxyTools.php
trunk/phase3/tests/phpunit/includes/ProxyTools/wfGetIPTest.php
Modified: trunk/phase3/includes/ProxyTools.php
===
--- trunk/phase3/includes/ProxyTools.php2011-08-16 13:35:44 UTC (rev
94637)
+++ trunk/phase3/includes/ProxyTools.php2011-08-16 14:15:07 UTC (rev
94638)
@@ -64,12 +64,19 @@
/**
* Work out the IP address based on various globals
* For trusted proxies, use the XFF client IP (first of the chain)
+ * @param $reset boolean Used to reset the internal static variable
+ * tracking the IP address. Set to anything non empty to reset it, for
+ * example: wfGetIP( 'reset' ); (default: false).
* @return string
*/
-function wfGetIP() {
+function wfGetIP( $reset = false ) {
global $wgUsePrivateIPs, $wgCommandLineMode;
static $ip = false;
+ if( $reset ) {
+ $ip = false;
+ }
+
# Return cached result
if ( !empty( $ip ) ) {
return $ip;
Modified: trunk/phase3/tests/phpunit/includes/ProxyTools/wfGetIPTest.php
===
--- trunk/phase3/tests/phpunit/includes/ProxyTools/wfGetIPTest.php
2011-08-16 13:35:44 UTC (rev 94637)
+++ trunk/phase3/tests/phpunit/includes/ProxyTools/wfGetIPTest.php
2011-08-16 14:15:07 UTC (rev 94638)
@@ -9,14 +9,12 @@
* TODO: need to cover the part dealing with XFF headers.
*/
class wfGetIPTest extends MediaWikiTestCase {
- // constant used to reset wfGetIP() internal static variable
- const doReset = true;
/** helper */
public function assertIP( $expected, $msg = '' ) {
$this-assertEquals(
$expected,
- wfGetIP( wfGetIPTest::doReset ),
+ wfGetIP( 'reset' ),
$msg );
}
@@ -24,13 +22,10 @@
public function assertIPNot( $expected, $msg = '' ) {
$this-assertNotEquals(
$expected,
- wfGetIP( wfGetIPTest::doReset ),
+ wfGetIP( 'reset' ),
$msg );
}
- /**
-* @group Broken
-*/
function testGetLoopbackAddressWhenInCommandLine() {
global $wgCommandLineMode;
$save = $wgCommandLineMode;
@@ -42,9 +37,6 @@
$wgCommandLineMode = $save;
}
- /**
-* @group Broken
-*/
function testGetFromServerRemoteAddr() {
global $_SERVER;
$save = null;
@@ -70,11 +62,17 @@
} else {
$_SERVER['REMOTE_ADDR'] = $save;
}
+ # Restore internal static altered above
+ wfGetIP( 'reset' );
}
/**
* @expectedException MWException
* @group Broken
+* This is broken since it alter $wgCommandLineMode which is needed
+* by our exception handler. Until someone find a correct way to handle
+* this case, the test should stay in the Broken group.
+*
*/
function testLackOfRemoteAddrThrowAnException() {
global $wgCommandLineMode;
@@ -83,7 +81,7 @@
# PHPUnit runs from the command line
$wgCommandLineMode = false;
# Next call throw an exception about lacking an IP
- wfGetIP( wfGetIPTest::doReset );
+ wfGetIP( 'reset' );
$wgCommandLineMode = $save;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94639] trunk/extensions/SocialProfile/UserProfile/ SpecialUpdateProfile.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94639
Revision: 94639
Author: ashley
Date: 2011-08-16 14:18:19 + (Tue, 16 Aug 2011)
Log Message:
---
SocialProfile: move some code specific to UserMailingList out of here and add
two new hooks for UserMailingList; using a hook is a lot better than checking
for $wgSitename here
Modified Paths:
--
trunk/extensions/SocialProfile/UserProfile/SpecialUpdateProfile.php
Modified: trunk/extensions/SocialProfile/UserProfile/SpecialUpdateProfile.php
===
--- trunk/extensions/SocialProfile/UserProfile/SpecialUpdateProfile.php
2011-08-16 14:15:07 UTC (rev 94638)
+++ trunk/extensions/SocialProfile/UserProfile/SpecialUpdateProfile.php
2011-08-16 14:18:19 UTC (rev 94639)
@@ -183,7 +183,7 @@
* Save social preferences into the database.
*/
function saveSettings_pref() {
- global $wgUser, $wgOut, $wgRequest, $wgSitename;
+ global $wgUser, $wgRequest;
$notify_friend = $wgRequest-getVal( 'notify_friend' );
$notify_gift = $wgRequest-getVal( 'notify_gift' );
@@ -211,36 +211,9 @@
$wgUser-setOption( 'notifyhonorifics', $notify_honorifics );
$wgUser-setOption( 'notifymessage', $notify_message );
$wgUser-saveSettings();
- // This code is mostly related to ArmchairGM, however can be
fixed to be used for others.
- if ( $wgSitename == 'ArmchairGM' ) {
- $dbw = wfGetDB( DB_MASTER );
- // If the user wants a weekly email, we'll put some
info about that to the user_mailing_list table
- if ( $wgRequest-getVal( 'weeklyemail' ) == 1 ) {
- $s = $dbw-selectRow(
- 'user_mailing_list',
- array( 'um_user_id' ),
- array( 'um_user_id' = $wgUser-getID()
),
- __METHOD__
- );
- if ( $s === false ) {
- $dbw-insert(
- 'user_mailing_list',
- array(
- 'um_user_id' =
$wgUser-getID(),
- 'um_user_name' =
$wgUser-getName(),
- ),
- __METHOD__
- );
- }
- } else {
- // Otherwise, just delete the entry.
- $dbw-delete(
- 'user_mailing_list',
- array( 'um_user_id' = $wgUser-getID()
),
- __METHOD__
- );
- }
- }
+
+ // Allow extensions like UserMailingList do their magic here
+ wfRunHooks( 'SpecialUpdateProfile::saveSettings_pref', array(
$this, $wgRequest ) );
}
function formatBirthdayDB( $birthday ) {
@@ -712,6 +685,9 @@
' input type=checkbox size=25
name=notify_honorifics id=notify_honorifics value=1' . ( (
$wgUser-getIntOption( 'notifyhonorifics', 1 ) == 1 ) ? 'checked' : '' ) . '/
/p';
+ // Allow extensions (like UserMailingList) to add new checkboxes
+ wfRunHooks( 'SpecialUpdateProfile::displayPreferencesForm',
array( $this, $form ) );
+
$form .= '/div
div class=cleared/div';
$form .= 'input type=button class=site-button value=' .
wfMsg( 'user-profile-update-button' ) . ' size=20
onclick=document.profile.submit() /
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94640] trunk/extensions/Commentbox/SpecialAddComment_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94640
Revision: 94640
Author: ialex
Date: 2011-08-16 14:45:37 + (Tue, 16 Aug 2011)
Log Message:
---
Removed usage of internal API call in Special:AddComment that was broken by
r83080; using WikiPage::doEdit() (or Article::doEdit() in earlier MW versions)
instead.
Modified Paths:
--
trunk/extensions/Commentbox/SpecialAddComment_body.php
Modified: trunk/extensions/Commentbox/SpecialAddComment_body.php
===
--- trunk/extensions/Commentbox/SpecialAddComment_body.php 2011-08-16
14:18:19 UTC (rev 94639)
+++ trunk/extensions/Commentbox/SpecialAddComment_body.php 2011-08-16
14:45:37 UTC (rev 94640)
@@ -75,37 +75,15 @@
// Append br / after each newline, except if the user started
a new paragraph
$Comment = preg_replace( '/(?!\n)\n(?!\n)/', br /\n,
$Comment );
$text .= \n\n . $subject . $Comment . \nbr / . $sig;
- try {
- $req = new FauxRequest( array(
- 'action' = 'edit',
- 'title' =
$title-getPrefixedText(),
- 'text'= $text,
- 'summary' = wfMsgForContent(
'commentbox-log' ),
- 'token' =
$wgUser-editToken(),
- ), true );
- $api = new ApiMain( $req, true );
- $api-execute();
- wfDebug( Completed API-Save\n );
- // we only reach this point if Api doesn't throw an
exception
- $data = $api-getResultData();
- if ( $data['edit']['result'] == 'Failure' ) {
- $spamurl = $data['edit']['spamblacklist'];
- if ( $spamurl != '' )
- throw new Exception( Die Seite
enthaelt die Spam-Url ``{$spamurl}'' );
- else
- throw new Exception( Unbekannter
Fehler );
- }
- } catch ( Exception $e ) {
- global $wgOut;
+ $status = $article-doEdit( $text, wfMsgForContent(
'commentbox-log' ) );
+
+ if ( $status-isOK() ) {
+ $wgOut-redirect( $title-getFullURL() );
+ } else {
$wgOut-setPageTitle( wfMsg(
'commentbox-errorpage-title' ) );
- $wgOut-addHTML( div class='errorbox' .
htmlspecialchars( $e-getMessage() ) . /divbr clear='both' / );
- if ( $title != null )
- $wgOut-returnToMain( false, $title );
- return;
+ $wgOut-addWikiText( $status-getWikiText() );
+ $wgOut-returnToMain( false, $title );
}
-
- $wgOut-redirect( $title-getFullURL() );
- return;
}
function fail( $str, $title = null ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94641] trunk/extensions/ArchiveLinks/ApiQueryArchiveFeed.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94641
Revision: 94641
Author: kbrown
Date: 2011-08-16 14:48:07 + (Tue, 16 Aug 2011)
Log Message:
---
fix problem with ApiQueryArchiveFeed with improper paramater types and not
continueing.
Modified Paths:
--
trunk/extensions/ArchiveLinks/ApiQueryArchiveFeed.php
Modified: trunk/extensions/ArchiveLinks/ApiQueryArchiveFeed.php
===
--- trunk/extensions/ArchiveLinks/ApiQueryArchiveFeed.php 2011-08-16
14:45:37 UTC (rev 94640)
+++ trunk/extensions/ArchiveLinks/ApiQueryArchiveFeed.php 2011-08-16
14:48:07 UTC (rev 94641)
@@ -2,7 +2,7 @@
class ApiQueryArchiveFeed extends ApiQueryBase {
function __construct ( $query, $moduleName ) {
- parent::__construct( $query, $moduleName, 'al' );
+ parent::__construct( $query, $moduleName, 'arl' );
}
public function execute ( ) {
@@ -10,7 +10,7 @@
$this-addTables( 'el_archive_queue' );
$this-addFields( '*' );
- $this-addWhereRange( 'insertion_time', $params['dir'],
$params['start'], $params['end'] );
+ $this-addWhereRange( 'queue_id', $params['dir'],
$params['start'], $params['end'] );
$this-addOption( 'LIMIT', $params['limit'] + 1 );
$res = $this-select( __METHOD__ );
@@ -22,10 +22,11 @@
foreach ( $res as $row ) {
//much of this is stolen from ApiQueryRecentChanges
if ( ++ $count $params['limit'] ) {
- $this-setContinueEnumParameter( 'start',
wfTimestamp( TS_UNIX, $row-insertion_time ) );
+ $this-setContinueEnumParameter( 'start',
$row-queue_id );
break;
}
+ $val['feed_id'] = $row-queue_id;
$val['time'] = $row-insertion_time;
$val['page_id'] = $row-page_id;
$val['url'] = $row-url;
@@ -33,7 +34,7 @@
$fit = $result-addValue( array( 'query',
$this-getModuleName() ), null, $val );
if ( !$fit ) {
- $this-setContinueEnumParameter( 'start',
wfTimestamp( TS_UNIX, $row-insertion_time ) );
+ $this-setContinueEnumParameter( 'start',
$row-queue_id );
break;
}
}
@@ -55,10 +56,10 @@
ApiBase::PARAM_MAX2 = ApiBase::LIMIT_BIG2
),
'start' = array(
- ApiBase::PARAM_TYPE = 'timestamp'
+ ApiBase::PARAM_TYPE = 'integer'
),
'end' = array(
- ApiBase::PARAM_TYPE = 'timestamp'
+ ApiBase::PARAM_TYPE = 'integer'
),
'dir' = array(
ApiBase::PARAM_DFLT = 'older',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94642] trunk/extensions/Maps/includes/services/GoogleMaps3/jquery. googlemap.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94642
Revision: 94642
Author: jeroendedauw
Date: 2011-08-16 14:55:04 + (Tue, 16 Aug 2011)
Log Message:
---
ie fixes
Modified Paths:
--
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
===
--- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 14:48:07 UTC (rev 94641)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 14:55:04 UTC (rev 94642)
@@ -83,42 +83,34 @@
this.markers = [];
};
+ /**
+* Remove the earth type from options.types if it's present.
+*
+* @since 1.0.1
+*/
+ this.removeEarthType = function() {
+ if ( Array.prototype.filter ) {
+ options.types = options.types.filter( function(
element, index, array ) { return element != 'earth'; } );
+ }
+ else {
+ // Seems someone is using the o-so-awesome browser that
is IE.
+ var types = [];
+
+ for ( i in options.types ) {
+ if ( options.types[i] != 'earth' ) {
+ types.push( options.types[i] );
+ }
+ }
+
+ options.types = types;
+ }
+ };
+
var showEarth = $.inArray( 'earth', options.types );
// If there are any non-Google KML/KMZ layers, load the geoxml library
and use it to add these layers.
if ( showEarth ) {
- // Yay, IE seriously fails. Compat code for IE 9.
- if (!Array.prototype.filter)
- {
- Array.prototype.filter = function(fun /*, thisp */)
- {
- use strict;
-
- if (this === void 0 || this === null)
- throw new TypeError();
-
- var t = Object(this);
- var len = t.length 0;
- if (typeof fun !== function)
- throw new TypeError();
-
- var res = [];
- var thisp = arguments[1];
- for (var i = 0; i len; i++)
- {
- if (i in t)
- {
- var val = t[i]; // in case fun
mutates this
- if (fun.call(thisp, val, i, t))
- res.push(val);
- }
- }
-
- return res;
- };
- }
-
- options.types.filter( function( element, index, array ) {
return element != 'earth'; } );
+ this.removeEarthType();
}
var mapOptions = {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94643] trunk/phase3/tests
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94643
Revision: 94643
Author: ialex
Date: 2011-08-16 15:17:35 + (Tue, 16 Aug 2011)
Log Message:
---
Some misc fixes to tests:
* Don't create a WebRequest instance to put in $wgRequest in test since it is
meant for HTTP requests, not command line ones
* Force $wgAlwaysUseTidy to false in ExtraParserTest, having it to true breaks
testBug8689() and testParse()
Modified Paths:
--
trunk/phase3/tests/parser/parserTest.inc
trunk/phase3/tests/phpunit/includes/ExtraParserTest.php
trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
Modified: trunk/phase3/tests/parser/parserTest.inc
===
--- trunk/phase3/tests/parser/parserTest.inc2011-08-16 14:55:04 UTC (rev
94642)
+++ trunk/phase3/tests/parser/parserTest.inc2011-08-16 15:17:35 UTC (rev
94643)
@@ -170,7 +170,7 @@
$wgLang = $context-getLang();
$wgOut = $context-getOutput();
$wgParser = new StubObject( 'wgParser', $wgParserConf['class'],
array( $wgParserConf ) );
- $wgRequest = new WebRequest;
+ $wgRequest = $context-getRequest();
if ( $wgStyleDirectory === false ) {
$wgStyleDirectory = $IP/skins;
Modified: trunk/phase3/tests/phpunit/includes/ExtraParserTest.php
===
--- trunk/phase3/tests/phpunit/includes/ExtraParserTest.php 2011-08-16
14:55:04 UTC (rev 94642)
+++ trunk/phase3/tests/phpunit/includes/ExtraParserTest.php 2011-08-16
15:17:35 UTC (rev 94643)
@@ -10,11 +10,13 @@
global $wgContLang;
global $wgShowDBErrorBacktrace;
global $wgLanguageCode;
+ global $wgAlwaysUseTidy;
$wgShowDBErrorBacktrace = true;
$wgLanguageCode = 'en';
$wgContLang = new Language( 'en' );
$wgMemc = new EmptyBagOStuff;
+ $wgAlwaysUseTidy = false;
$this-options = new ParserOptions;
$this-options-setTemplateCallback( array( __CLASS__,
'statelessFetchTemplate' ) );
Modified: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
===
--- trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
2011-08-16 14:55:04 UTC (rev 94642)
+++ trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php
2011-08-16 15:17:35 UTC (rev 94643)
@@ -82,7 +82,7 @@
$tmpGlobals['wgLang'] = $context-getLang();
$tmpGlobals['wgOut'] = $context-getOutput();
$tmpGlobals['wgParser'] = new StubObject( 'wgParser',
$GLOBALS['wgParserConf']['class'], array( $GLOBALS['wgParserConf'] ) );
- $tmpGlobals['wgRequest'] = new WebRequest;
+ $tmpGlobals['wgRequest'] = $context-getRequest();
if ( $GLOBALS['wgStyleDirectory'] === false ) {
$tmpGlobals['wgStyleDirectory'] = $IP/skins;
Modified: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
===
--- trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
2011-08-16 14:55:04 UTC (rev 94642)
+++ trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php
2011-08-16 15:17:35 UTC (rev 94643)
@@ -52,7 +52,7 @@
$wgLang = $context-getLang();
$wgOut = $context-getOutput();
$wgParser = new StubObject( 'wgParser', $wgParserConf['class'],
array( $wgParserConf ) );
- $wgRequest = new WebRequest;
+ $wgRequest = $context-getRequest();
if ( $wgStyleDirectory === false ) {
$wgStyleDirectory = $IP/skins;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94644] branches/REL1_18/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94644
Revision: 94644
Author: catrope
Date: 2011-08-16 15:22:35 + (Tue, 16 Aug 2011)
Log Message:
---
1.18: Back out mw.Title, which isn't used by anything in 1.18 (AJAXCategories
was backed out, UploadWizard has its own copy) and which has some strangely
named public functions we'll probably want to change in 1.19. This reverts
almost all of r90331 (which introduced mw.Title; the other revs to it were
post-branch), only the changes to jquery.qunit.completenessTest.js (don't
descend into a constructor) were left in.
Modified Paths:
--
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/resources/Resources.php
branches/REL1_18/phase3/tests/qunit/data/testrunner.js
branches/REL1_18/phase3/tests/qunit/index.html
Removed Paths:
-
branches/REL1_18/phase3/resources/mediawiki/mediawiki.Title.js
branches/REL1_18/phase3/tests/qunit/suites/resources/mediawiki/mediawiki.Title.js
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-08-16 15:17:35 UTC (rev
94643)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-08-16 15:22:35 UTC (rev
94644)
@@ -175,7 +175,6 @@
* (bug 28904) (bug 29773) Update jQuery version from 1.4.4 to 1.6.2 (the
latest version)
* (bug 29441) Expose CapitalLinks config in JS to allow modules to properly
handle titles on case-sensitive wikis.
-* (bug 29397) Implement mw.Title module in core.
* In MySQL 4.1.9+ with replication enabled, the slave lag should come from
SHOW SLAVE STATUS instead of SHOW PROCESSLIST.
* Language codes in $wgDummyLanguageCodes are now excluded on localization
Modified: branches/REL1_18/phase3/resources/Resources.php
===
--- branches/REL1_18/phase3/resources/Resources.php 2011-08-16 15:17:35 UTC
(rev 94643)
+++ branches/REL1_18/phase3/resources/Resources.php 2011-08-16 15:22:35 UTC
(rev 94644)
@@ -448,9 +448,6 @@
'mediawiki.htmlform' = array(
'scripts' = 'resources/mediawiki/mediawiki.htmlform.js',
),
- 'mediawiki.Title' = array(
- 'scripts' = 'resources/mediawiki/mediawiki.Title.js',
- ),
'mediawiki.user' = array(
'scripts' = 'resources/mediawiki/mediawiki.user.js',
'dependencies' = array(
Deleted: branches/REL1_18/phase3/resources/mediawiki/mediawiki.Title.js
===
--- branches/REL1_18/phase3/resources/mediawiki/mediawiki.Title.js
2011-08-16 15:17:35 UTC (rev 94643)
+++ branches/REL1_18/phase3/resources/mediawiki/mediawiki.Title.js
2011-08-16 15:22:35 UTC (rev 94644)
@@ -1,316 +0,0 @@
-/**
- * mediaWiki.Title
- *
- * @author Neil Kandalgaonkar, 2010
- * @author Timo Tijhof, 2011
- * @since 1.18
- *
- * Relies on: mw.config (wgFormattedNamespaces, wgNamespaceIds,
wgCaseSensitiveNamespaces), mw.util.wikiGetlink
- */
-(function( $ ) {
-
- /* Local space */
-
- /**
-* Title
-* @constructor
-*
-* @param title {String} Title of the page. If no second argument given,
-* this will be searched for a namespace.
-* @param namespace {Number} (optional) Namespace id. If given, title
will be taken as-is.
-* @return {Title} this
-*/
-varTitle = function( title, namespace ) {
- this._ns = 0; // integer namespace id
- this._name = null; // name in canonical 'database' form
- this._ext = null; // extension
-
- if ( arguments.length === 2 ) {
- this.setNameAndExtension( title
).setNamespaceById( namespace );
- } else if ( arguments.length === 1 ) {
- // If title is like Blabla: Hello ignore
exception by setNamespace(),
- // and instead assume NS_MAIN and keep prefix
- try {
- this.setAll( title );
- } catch(e) {
- this.setNameAndExtension( title );
- }
- }
- return this;
- },
-
- /**
-* Strip some illegal chars: control chars, colon, less than, greater
than,
-* brackets, braces, pipe, whitespace and normal spaces. This still
leaves some insanity
-* intact, like unicode bidi chars, but it's a good start..
-* @param s {String}
-* @return {String}
-*/
- clean = function( s ) {
- if ( s !== undefined ) {
- return s.replace(
/[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f\s]+/g, '_' );
-
[MediaWiki-CVS] SVN: [94645] trunk/extensions/SemanticForms/includes/SF_Utils.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94645
Revision: 94645
Author: ankitgarg833
Date: 2011-08-16 15:31:28 + (Tue, 16 Aug 2011)
Log Message:
---
adding some cosmetic changes
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_Utils.php
Modified: trunk/extensions/SemanticForms/includes/SF_Utils.php
===
--- trunk/extensions/SemanticForms/includes/SF_Utils.php2011-08-16
15:22:35 UTC (rev 94644)
+++ trunk/extensions/SemanticForms/includes/SF_Utils.php2011-08-16
15:31:28 UTC (rev 94645)
@@ -31,7 +31,6 @@
global $wgCapitalLinks;
return $wgCapitalLinks;
}
-
}
/**
@@ -112,7 +111,6 @@
return array_unique( $values );
}
}
-
/**
* Helper function - gets names of categories for a page;
* based on Title::getParentCategories(), but simpler
@@ -257,12 +255,12 @@
$obj = $pageSchemaObj-getObject('Form');
$form_array = $obj['sf'];
- $form_html_text .= 'plegendsemanticForms:Form/legend /p
+ $form_html_text .= 'fieldset style=background:
#00FF00;plegendForm/legend /p
p Name: input size=15 name=sf_form_name_starter value=
'.$form_array['name'].' /p
- p PageNameFormula: input size=20
name=sf_page_name_formula_starter value='.$form_array['PageNameFormula'].'
/p
- p CreateTite: input size=25 name=sf_create_title_starter
value='.$form_array['CreateTite'].' /p
- p EditTitle: input size=25 name=sf_edit_title_starter
value='.$form_array['EditTitle'].' /p
- ';
+ p Page name formula: input size=20
name=sf_page_name_formula_starter value='.$form_array['PageNameFormula'].'
/p
+ p Create tite: input size=25
name=sf_create_title_starter value='.$form_array['CreateTite'].' /p
+ p Edit title: input size=25 name=sf_edit_title_starter
value='.$form_array['EditTitle'].' /p
+ /fieldset';
foreach ( $template_all as $template ) {
$field_all = $template-getFields();
$field_count = 0; //counts the number of fields
@@ -271,8 +269,8 @@
$field_count++;
$sf_array =
$field-getObject('FormInput');//this returns an array with property values
filled
$form_input_array = $sf_array['sf'];
- $html_text =
'plegendsemanticForms:FormInput/legend /p
- p Input-Type: input size=15 name=sf_input_type_starter
value='.$form_input_array['InputType'].'/p
+ $html_text = 'fieldset style=background:
#00FF00;plegendForm input/legend /p
+ p Input type: input size=15 name=sf_input_type_starter
value='.$form_input_array['InputType'].'/p
pParameter name and its value as a key=value pair,seperated
by comma (if a value contains a comma, replace it with \,): For eg.
Size=20,mandatory=true/p';
$param_value_str= ;
foreach($form_input_array as $param = $value){
@@ -284,7 +282,7 @@
}
}
}
- $html_text .= 'pinput
name=sf_key_values_starter size=80 value='.$param_value_str.' /p';
+ $html_text .= 'pinput
name=sf_key_values_starter size=80 value='.$param_value_str.'
/fieldset/p';
$html_text_array[] = $html_text;
}
}
@@ -295,18 +293,18 @@
public static function getHtmlTextForPS( $js_extensions
,$text_extensions ) {
$html_text = ;
$form_text = ;
-
- $form_text .= 'plegendsemanticForms:Form/legend /p
+ //'fieldset style=background: #00FF00;plegendForm
input/legend /p
+ $form_text .= 'fieldset style=background:
#00FF00;plegendForm/legend /p
p Name: input size=15 name=sf_form_name_starter/p
- p PageNameFormula: input size=20
name=sf_page_name_formula_starter/p
- p CreateTite: input size=25
name=sf_create_title_starter/p
- p EditTitle: input size=25
name=sf_edit_title_starter/p
- ';
+ p Page name formula: input size=20
name=sf_page_name_formula_starter/p
+ p Create tite: input size=25
name=sf_create_title_starter/p
+ p Edit title: input size=25
name=sf_edit_title_starter/p
[MediaWiki-CVS] SVN: [94646] trunk/phase3/resources
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94646
Revision: 94646
Author: catrope
Date: 2011-08-16 15:32:08 + (Tue, 16 Aug 2011)
Log Message:
---
Fix some indentation and comments in mediawiki.Title, and make it depend on
mediawiki.util
Modified Paths:
--
trunk/phase3/resources/Resources.php
trunk/phase3/resources/mediawiki/mediawiki.title.js
Modified: trunk/phase3/resources/Resources.php
===
--- trunk/phase3/resources/Resources.php2011-08-16 15:31:28 UTC (rev
94645)
+++ trunk/phase3/resources/Resources.php2011-08-16 15:32:08 UTC (rev
94646)
@@ -463,6 +463,7 @@
),
'mediawiki.Title' = array(
'scripts' = 'resources/mediawiki/mediawiki.title.js',
+ 'dependencies' = 'mediawiki.util',
),
'mediawiki.Uri' = array(
'scripts' = 'resources/mediawiki/mediawiki.uri.js',
Modified: trunk/phase3/resources/mediawiki/mediawiki.title.js
===
--- trunk/phase3/resources/mediawiki/mediawiki.title.js 2011-08-16 15:31:28 UTC
(rev 94645)
+++ trunk/phase3/resources/mediawiki/mediawiki.title.js 2011-08-16 15:32:08 UTC
(rev 94646)
@@ -21,17 +21,17 @@
* @return {Title} this
*/
varTitle = function( title, namespace ) {
- this._ns = 0; // integer namespace id
- this._name = null; // name in canonical 'database' form
- this._ext = null; // extension
+ this._ns = 0; // integer namespace id
+ this._name = null; // name in canonical 'database' form
+ this._ext = null; // extension
- if ( arguments.length === 2 ) {
- setNameAndExtension( this, title );
- this._ns = fixNsId( namespace );
- } else if ( arguments.length === 1 ) {
- setAll( this, title );
- }
- return this;
+ if ( arguments.length === 2 ) {
+ setNameAndExtension( this, title );
+ this._ns = fixNsId( namespace );
+ } else if ( arguments.length === 1 ) {
+ setAll( this, title );
+ }
+ return this;
},
/**
@@ -168,12 +168,12 @@
/* Static space */
/**
-* Wether this title exists on the wiki.
+* Whether this title exists on the wiki.
* @param title {mixed} prefixed db-key name (string) or instance of
Title
* @return {mixed} Boolean true/false if the information is available.
Otherwise null.
*/
Title.exists = function( title ) {
- var type = $.type( title ), obj = Title.exist.pages, match;
+ var type = $.type( title ), obj = Title.exist.pages, match;
if ( type === 'string' ) {
match = obj[title];
} else if ( type === 'object' title instanceof Title ) {
@@ -206,7 +206,7 @@
set: function( titles, state ) {
titles = $.isArray( titles ) ? titles : [titles];
state = state === undefined ? true : !!state;
- var pages = this.pages, i, len = titles.length;
+ var pages = this.pages, i, len = titles.length;
for ( i = 0; i len; i++ ) {
pages[ titles[i] ] = state;
}
@@ -313,7 +313,7 @@
},
/**
-* Wether this title exists on the wiki.
+* Whether this title exists on the wiki.
* @return {mixed} Boolean true/false if the information is
available. Otherwise null.
*/
exists: function() {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94647] trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94647
Revision: 94647
Author: ankitgarg833
Date: 2011-08-16 15:41:02 + (Tue, 16 Aug 2011)
Log Message:
---
ading cosmetic changes
Modified Paths:
--
trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
Modified: trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
===
--- trunk/extensions/SemanticDrilldown/includes/SD_Utils.php2011-08-16
15:32:08 UTC (rev 94646)
+++ trunk/extensions/SemanticDrilldown/includes/SD_Utils.php2011-08-16
15:41:02 UTC (rev 94647)
@@ -67,11 +67,11 @@
$field_all = $template-getFields();
$field_count = 0; //counts the number of fields
foreach( $field_all as $field ) {
- $html_text .=
'plegendsemanticDrillDown:Filter/legend /p';
+ $html_text .= 'fieldset style=background:
#800080;plegendFilter/legend /p';
$field_count++;
$sd_array = $field-getObject('Filter');//this
returns an array with property values filled
$filter_array = $sd_array['sd'];
- $html_text .= 'p$name_label input size=25
name=sd_filter_name_starter value='.$filter_array['Label'].' /p';
+ $html_text .= 'p'.$name_label.' input
size=25 name=sd_filter_name_starter value='.$filter_array['Label'].'
/p';
$html_text .= 'pinput type=radio
name=sd_values_source_starter checked value=property'.
$values_from_property_label.'
/p';
@@ -161,7 +161,7 @@
$html_text .= 'option
value='.$combo_box_value.''.$combo_box_label.'/option
option
value='.$date_range_value.''.$date_range_label.'/option
/select
- /p';
+ /p/fieldset';
}
}
$html_text_array[] = $html_text;
@@ -215,13 +215,12 @@
global $wgContLang;
$text = ;
- $text .= 'plegendsemanticDrillDown:Filter/legend /p';
+ $text .= 'fieldset style=background:
#800080;plegendFilter/legend /p';
$name_label = wfMsg( 'sd_createfilter_name' );
$property_label = wfMsg( 'sd_createfilter_property' );
$label_label = wfMsg( 'sd_createfilter_label' );
- $text .= END
- p$name_label input size=25 name=sd_filter_name_starter
value=/p
-END;
+ $text .= '
+ p'.$name_label.' input size=25
name=sd_filter_name_starter value=/p ';
$values_from_property_label = wfMsg(
'sd_createfilter_usepropertyvalues' );
$values_from_category_label = wfMsg(
'sd_createfilter_usecategoryvalues' );
@@ -277,7 +276,7 @@
option value=$date_range_value$date_range_label/option
/select
/p
-
+ /fieldset
END;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94648] trunk/extensions/Maps/includes/services/GoogleMaps3/jquery. googlemap.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94648
Revision: 94648
Author: jeroendedauw
Date: 2011-08-16 15:51:30 + (Tue, 16 Aug 2011)
Log Message:
---
google earth fixes
Modified Paths:
--
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
===
--- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 15:41:02 UTC (rev 94647)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 15:51:30 UTC (rev 94648)
@@ -24,7 +24,6 @@
*/
this.addMarker = function( markerData ) {
var markerOptions = {
- map: this.map,
position: new google.maps.LatLng( markerData.lat ,
markerData.lon ),
title: markerData.title
};
@@ -106,8 +105,31 @@
}
};
- var showEarth = $.inArray( 'earth', options.types );
+ this.addOverlays = function() {
+ debugger;
+ for ( i in this.markers ) {
+ this.markers[i].setMap( map );
+ }
+
+ // Add the Google KML/KMZ layers.
+ for ( i = options.gkml.length - 1; i = 0; i-- ) {
+ var kmlLayer = new google.maps.KmlLayer(
options.gkml[i], { map: map } );
+ }
+
+ // If there are any non-Google KML/KMZ layers, load the geoxml
library and use it to add these layers.
+ if ( options.kml.length != 0 ) {
+ mw.loader.using( 'ext.maps.gm3.geoxml', function() {
+ var geoXml = new geoXML3.parser( { map: map } );
+
+ for ( i = options.kml.length - 1; i = 0; i-- )
{
+ geoXml.parse( options.kml[i] );
+ }
+ } );
+ }
+ };
+ var showEarth = $.inArray( 'earth', options.types ) !== -1;
+
// If there are any non-Google KML/KMZ layers, load the geoxml library
and use it to add these layers.
if ( showEarth ) {
this.removeEarthType();
@@ -140,52 +162,15 @@
var map = new google.maps.Map( this.get( 0 ), mapOptions );
this.map = map;
- var markers = [];
if ( !options.locations ) {
options.locations = [];
}
// Add the markers.
for ( var i = options.locations.length - 1; i = 0; i-- ) {
- markers.push( this.addMarker( options.locations[i] ) );
+ this.addMarker( options.locations[i] );
}
- // Add the Google KML/KMZ layers.
- for ( i = options.gkml.length - 1; i = 0; i-- ) {
- var kmlLayer = new google.maps.KmlLayer( options.gkml[i], {
map: map } );
- }
-
- // If there are any non-Google KML/KMZ layers, load the geoxml library
and use it to add these layers.
- if ( options.kml.length != 0 ) {
- mw.loader.using( 'ext.maps.gm3.geoxml', function() {
- var geoXml = new geoXML3.parser( { map: map } );
-
- for ( i = options.kml.length - 1; i = 0; i-- ) {
- geoXml.parse( options.kml[i] );
- }
- } );
- }
-
- if ( showEarth ) {
- $.getScript(
- 'https://www.google.com/jsapi?key=' + mw.config.get(
'egGoogleJsApiKey' ),
- function( data, textStatus ) {
- google.load( 'earth', '1', { callback:
function() {
- mw.loader.using( 'ext.maps.gm3.earth',
function() {
- if ( google.earth.isSupported()
) {
- var ge = new
GoogleEarth( map );
-
- var lookAt =
ge.getView().copyAsLookAt(ge.ALTITUDE_RELATIVE_TO_GROUND);
-
-
lookAt.setTilt(lookAt.getTilt() + options.tilt);
-
ge.getView().setAbstractView(lookAt);
- }
- } );
- } } );
- }
- );
- }
-
for ( i = options.fusiontables.length - 1; i = 0; i-- ) {
[MediaWiki-CVS] SVN: [94649] trunk/extensions/SemanticForms/includes/SF_Utils.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94649
Revision: 94649
Author: ankitgarg833
Date: 2011-08-16 15:52:24 + (Tue, 16 Aug 2011)
Log Message:
---
adding few cosmetic changes...
Modified Paths:
--
trunk/extensions/SemanticForms/includes/SF_Utils.php
Modified: trunk/extensions/SemanticForms/includes/SF_Utils.php
===
--- trunk/extensions/SemanticForms/includes/SF_Utils.php2011-08-16
15:51:30 UTC (rev 94648)
+++ trunk/extensions/SemanticForms/includes/SF_Utils.php2011-08-16
15:52:24 UTC (rev 94649)
@@ -255,7 +255,7 @@
$obj = $pageSchemaObj-getObject('Form');
$form_array = $obj['sf'];
- $form_html_text .= 'fieldset style=background:
#00FF00;plegendForm/legend /p
+ $form_html_text .= 'fieldset style=background:
#00FF00;legendForm/legend
p Name: input size=15 name=sf_form_name_starter value=
'.$form_array['name'].' /p
p Page name formula: input size=20
name=sf_page_name_formula_starter value='.$form_array['PageNameFormula'].'
/p
p Create tite: input size=25
name=sf_create_title_starter value='.$form_array['CreateTite'].' /p
@@ -269,7 +269,7 @@
$field_count++;
$sf_array =
$field-getObject('FormInput');//this returns an array with property values
filled
$form_input_array = $sf_array['sf'];
- $html_text = 'fieldset style=background:
#00FF00;plegendForm input/legend /p
+ $html_text = 'fieldset style=background:
#00FF00;legendForm input/legend
p Input type: input size=15 name=sf_input_type_starter
value='.$form_input_array['InputType'].'/p
pParameter name and its value as a key=value pair,seperated
by comma (if a value contains a comma, replace it with \,): For eg.
Size=20,mandatory=true/p';
$param_value_str= ;
@@ -294,14 +294,14 @@
$html_text = ;
$form_text = ;
//'fieldset style=background: #00FF00;plegendForm
input/legend /p
- $form_text .= 'fieldset style=background:
#00FF00;plegendForm/legend /p
+ $form_text .= 'fieldset style=background:
#00FF00;legendForm/legend
p Name: input size=15 name=sf_form_name_starter/p
p Page name formula: input size=20
name=sf_page_name_formula_starter/p
p Create tite: input size=25
name=sf_create_title_starter/p
p Edit title: input size=25
name=sf_edit_title_starter/p
/fieldset';
- $html_text .= 'fieldset style=background: #00FF00;
plegendForm input/legend /p
+ $html_text .= 'fieldset style=background: #00FF00;
legendForm input/legend
p Input type: input size=15
name=sf_input_type_starter/p
pParameter name and its value as a key=value pair,seperated
by comma (if a value contains a comma, replace it with \,): For eg.
Size=20,mandatory=true/p
pinput value= name=sf_key_values_starter
size=80/p/fieldset';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94650] trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94650
Revision: 94650
Author: ankitgarg833
Date: 2011-08-16 15:52:57 + (Tue, 16 Aug 2011)
Log Message:
---
adding cosmetic changes
Modified Paths:
--
trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
Modified: trunk/extensions/SemanticDrilldown/includes/SD_Utils.php
===
--- trunk/extensions/SemanticDrilldown/includes/SD_Utils.php2011-08-16
15:52:24 UTC (rev 94649)
+++ trunk/extensions/SemanticDrilldown/includes/SD_Utils.php2011-08-16
15:52:57 UTC (rev 94650)
@@ -67,7 +67,7 @@
$field_all = $template-getFields();
$field_count = 0; //counts the number of fields
foreach( $field_all as $field ) {
- $html_text .= 'fieldset style=background:
#800080;plegendFilter/legend /p';
+ $html_text .= 'fieldset style=background:
#FF0080;legendFilter/legend';
$field_count++;
$sd_array = $field-getObject('Filter');//this
returns an array with property values filled
$filter_array = $sd_array['sd'];
@@ -215,7 +215,7 @@
global $wgContLang;
$text = ;
- $text .= 'fieldset style=background:
#800080;plegendFilter/legend /p';
+ $text .= 'fieldset style=background:
#FF0080;legendFilter/legend';
$name_label = wfMsg( 'sd_createfilter_name' );
$property_label = wfMsg( 'sd_createfilter_property' );
$label_label = wfMsg( 'sd_createfilter_label' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94651] trunk/extensions/Maps/includes/services/GoogleMaps3/jquery. googlemap.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94651
Revision: 94651
Author: jeroendedauw
Date: 2011-08-16 16:00:02 + (Tue, 16 Aug 2011)
Log Message:
---
fu r94648
Modified Paths:
--
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
===
--- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 15:52:57 UTC (rev 94650)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 16:00:02 UTC (rev 94651)
@@ -106,7 +106,6 @@
};
this.addOverlays = function() {
- debugger;
for ( i in this.markers ) {
this.markers[i].setMap( map );
}
@@ -230,12 +229,11 @@
if ( google.earth.isSupported()
) {
var ge = new
GoogleEarth( map );
- var lookAt =
ge.getView().copyAsLookAt(ge.ALTITUDE_RELATIVE_TO_GROUND);
+ //var lookAt =
ge.getView().copyAsLookAt(ge.ALTITUDE_RELATIVE_TO_GROUND);
-
lookAt.setTilt(lookAt.getTilt() + options.tilt);
-
ge.getView().setAbstractView(lookAt);
+
//lookAt.setTilt(lookAt.getTilt() + options.tilt);
+
//ge.getView().setAbstractView(lookAt);
}
- debugger;
_this.addOverlays();
} );
} } );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94652] trunk/phase3/includes/Article.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94652 Revision: 94652 Author: mah Date: 2011-08-16 16:03:29 + (Tue, 16 Aug 2011) Log Message: --- w/s changes Modified Paths: -- trunk/phase3/includes/Article.php Modified: trunk/phase3/includes/Article.php === --- trunk/phase3/includes/Article.php 2011-08-16 16:00:02 UTC (rev 94651) +++ trunk/phase3/includes/Article.php 2011-08-16 16:03:29 UTC (rev 94652) @@ -1984,7 +1984,7 @@ #wfWarn( Access to raw $fname field . __CLASS__ ); return $this-mPage-$fname; } -trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE ); + trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE ); } /** @@ -2019,7 +2019,7 @@ #wfWarn( Call to . __CLASS__ . ::$fname; please use WikiPage instead ); return call_user_func_array( array( $this-mPage, $fname ), $args ); } -trigger_error( 'Inaccessible function via __call(): ' . $fname, E_USER_ERROR ); + trigger_error( 'Inaccessible function via __call(): ' . $fname, E_USER_ERROR ); } // ** B/C functions to work-around PHP silliness with __call and references ** // ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94653] branches/salvatoreingala/Gadgets
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94653
Revision: 94653
Author: salvatoreingala
Date: 2011-08-16 16:08:00 + (Tue, 16 Aug 2011)
Log Message:
---
- Added 'list' type preferences (and done some refactoring of
jquery.formBuilder.js)
- Fixed a bug in Gadget::newFromDefinition, which was causing warnings
Modified Paths:
--
branches/salvatoreingala/Gadgets/Gadgets.i18n.php
branches/salvatoreingala/Gadgets/Gadgets.php
branches/salvatoreingala/Gadgets/Gadgets_tests.php
branches/salvatoreingala/Gadgets/backend/Gadget.php
branches/salvatoreingala/Gadgets/backend/GadgetPrefs.php
branches/salvatoreingala/Gadgets/ui/resources/jquery.formBuilder.css
branches/salvatoreingala/Gadgets/ui/resources/jquery.formBuilder.js
Modified: branches/salvatoreingala/Gadgets/Gadgets.i18n.php
===
--- branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-08-16 16:03:29 UTC
(rev 94652)
+++ branches/salvatoreingala/Gadgets/Gadgets.i18n.php 2011-08-16 16:08:00 UTC
(rev 94653)
@@ -66,10 +66,11 @@
'gadgets-formbuilder-editor-move-field' = 'Move this field',
'gadgets-formbuilder-editor-delete-field' = 'Delete this field',
'gadgets-formbuilder-editor-edit-field' = 'Edit field properties',
+ 'gadgets-formbuilder-editor-edit-field-title' = 'Edit field',
'gadgets-formbuilder-editor-insert-field' = 'Insert a new field',
'gadgets-formbuilder-editor-chose-field' = 'Chose the type of the new
field:',
'gadgets-formbuilder-editor-chose-field-title' = 'Chose field type',
- 'gadgets-formbuilder-editor-create-field-title' = 'Create field',
+ 'gadgets-formbuilder-editor-create-field-title' = Create '$1' field,
'gadgets-formbuilder-editor-duplicate-name' = 'The preference name $1
has been used. Please chose a different name.',
'gadgets-formbuilder-editor-edit-section' = 'Edit this section\'s
title',
'gadgets-formbuilder-editor-delete-section' = 'Delete this section and
all his content',
Modified: branches/salvatoreingala/Gadgets/Gadgets.php
===
--- branches/salvatoreingala/Gadgets/Gadgets.php2011-08-16 16:03:29 UTC
(rev 94652)
+++ branches/salvatoreingala/Gadgets/Gadgets.php2011-08-16 16:08:00 UTC
(rev 94653)
@@ -94,7 +94,7 @@
'gadgets-formbuilder-min', 'gadgets-formbuilder-max',
'gadgets-formbuilder-integer', 'gadgets-formbuilder-date',
'gadgets-formbuilder-color',
'gadgets-formbuilder-editor-ok',
'gadgets-formbuilder-editor-cancel', 'gadgets-formbuilder-editor-move-field',
- 'gadgets-formbuilder-editor-delete-field',
'gadgets-formbuilder-editor-edit-field',
'gadgets-formbuilder-editor-insert-field',
+ 'gadgets-formbuilder-editor-delete-field',
'gadgets-formbuilder-editor-edit-field',
'gadgets-formbuilder-editor-edit-field-title',
'gadgets-formbuilder-editor-insert-field',
'gadgets-formbuilder-editor-chose-field',
'gadgets-formbuilder-editor-chose-field-title',
'gadgets-formbuilder-editor-create-field-title',
'gadgets-formbuilder-editor-duplicate-name',
'gadgets-formbuilder-editor-delete-section',
'gadgets-formbuilder-editor-new-section',
'gadgets-formbuilder-editor-edit-section',
'gadgets-formbuilder-editor-chose-title',
'gadgets-formbuilder-editor-chose-title-title'
Modified: branches/salvatoreingala/Gadgets/Gadgets_tests.php
===
--- branches/salvatoreingala/Gadgets/Gadgets_tests.php 2011-08-16 16:03:29 UTC
(rev 94652)
+++ branches/salvatoreingala/Gadgets/Gadgets_tests.php 2011-08-16 16:08:00 UTC
(rev 94653)
@@ -616,7 +616,117 @@
//Check if only the wrong subfield has been reset to default
value
$this-assertEquals( $prefs, array( 'foo' = array( 'bar' =
false, 'car' = '#123456' ) ) );
}
-
+
+ //Tests for 'list' type fields
+ function testPrefsDescriptionsList() {
+ $correct = array(
+ 'fields' = array(
+ array(
+ 'name' = 'foo',
+ 'type' = 'list',
+ 'default' = array(),
+ 'field' = array(
+ 'type' = 'composite',
+ 'fields' = array(
+ array(
+ 'name' = 'bar',
+ 'type' =
'boolean',
+ 'label' =
'@msg1',
+
[MediaWiki-CVS] SVN: [94654] trunk/extensions/Maps/includes/services/GoogleMaps3/jquery. googlemap.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94654 Revision: 94654 Author: jeroendedauw Date: 2011-08-16 16:18:54 + (Tue, 16 Aug 2011) Log Message: --- switch to earth type once loaded Modified Paths: -- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js Modified: trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js === --- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js 2011-08-16 16:08:00 UTC (rev 94653) +++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js 2011-08-16 16:18:54 UTC (rev 94654) @@ -235,6 +235,7 @@ //ge.getView().setAbstractView(lookAt); } _this.addOverlays(); + map.setMapTypeId(GoogleEarth.MAP_TYPE_ID); } ); } } ); } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94656] trunk/extensions/SemanticMediaWiki
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94656
Revision: 94656
Author: devayon
Date: 2011-08-16 16:27:52 + (Tue, 16 Aug 2011)
Log Message:
---
mainlabel as a printout control. Follow-up r94616
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialQueryCreator.php
Modified: trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
===
--- trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-08-16 16:20:14 UTC (rev 94655)
+++ trunk/extensions/SemanticMediaWiki/languages/SMW_Messages.php
2011-08-16 16:27:52 UTC (rev 94656)
@@ -236,7 +236,6 @@
// Messages for Query Creator Special
'querycreator' = 'Query Creator',
- 'smw_qc_mainlabel' = 'Main label',
'smw_qc_addmainlabel' = 'Add main label',
'smw_qc_show_addnal_opts' = 'Show more options',
'smw_qc_hide_addnal_opts' = 'Show less options',
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 16:20:14 UTC (rev 94655)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 16:27:52 UTC (rev 94656)
@@ -416,6 +416,8 @@
$categoryNoValues = $wgRequest-getArray( 'cat_no' );
$mainColumnLabels = $wgRequest-getArray( 'maincol_label' );
$po = array();
+ $mainLabel = $wgRequest-getVal( 'pmainlabel', '' );
+ $params['mainlabel'] = $mainLabel;
// processing params for main result column
if ( is_array( $mainColumnLabels ) ) {
@@ -523,8 +525,36 @@
$wgOut-addScriptFile(
$smwgScriptPath/libs/jquery-ui/jquery-ui.dialog.min.js );
$wgOut-addStyle( $smwgScriptPath/skins/SMW_custom.css );
- $result = '';
+ $result = 'span id=smwposortbox';
$numSortValues = 0;
+ $params = $this-uiCore-getParameters();
+
+ // mainlabel
+ if ( is_array( $params ) array_key_exists( 'mainlabel',
$params ) ) {
+ $mainLabel = $params['mainlabel'];
+ } else {
+ $mainLabel = '';
+ }
+ if ( $mainLabel == '-' || $this-uiCore-getQueryString() == ''
) {
+ $mainLabelText = '';
+ $formDisplay = 'none';
+ } else {
+ $mainLabelText = $mainLabel;
+ $formDisplay = 'block';
+ }
+ $result .= Html::openElement( 'div', array( 'id' =
'smwmainlabel', 'class' = 'smwsort', 'style' = display:$formDisplay; ) ) .
+ Html::openElement( 'span',
array( 'class' = 'smwquisortlabel' ) ) .
+ Html::openElement( 'span',
array( 'class' = 'smw-remove' ) ) .
+ Html::openElement( 'a', array(
'href' = 'javascript:smwRemoveMainLabel()' ) ) .
+ 'img src=' . $smwgScriptPath
. '/skins/images/close-button.png alt=' . wfMsg( 'smw_qui_delete' ) . '' .
+ '/a' .
+ '/span' .
+ wfMsg( 'smw_qui_rescol' ) .
+ '/span' .
+ 'input size=25 value=' .
$mainLabelText . ' id=mainlabelvis /' .
+ 'input type=hidden
name=pmainlabel value=' . $mainLabel . ' id=mainlabelhid /' .
+ '/div';
+
// START: create form elements already submitted earlier via
form
// attempting to load parameters from $wgRequest
$propertyValues = $wgRequest-getArray( 'property' );
@@ -571,7 +601,6 @@
$categoryNoValues = array();
$mainColumnLabels = array();
- $params = $this-uiCore-getParameters();
if ( array_key_exists( 'sort', $params )
array_key_exists( 'order', $params ) ) {
$sortVal = explode( ',', trim( strtolower(
$params['sort'] ) ) );
$orderVal = explode( ',', $params['order'] );
@@ -741,7 +770,7 @@
$result .= Html::openElement( 'div', array(
'id' = sort_div_$i,
[MediaWiki-CVS] SVN: [94657] trunk/extensions/Categorize/Categorize.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94657 Revision: 94657 Author: siebrand Date: 2011-08-16 16:41:55 + (Tue, 16 Aug 2011) Log Message: --- Update extension description and awkward message 'categorize-footer'. Modified Paths: -- trunk/extensions/Categorize/Categorize.i18n.php Modified: trunk/extensions/Categorize/Categorize.i18n.php === --- trunk/extensions/Categorize/Categorize.i18n.php 2011-08-16 16:27:52 UTC (rev 94656) +++ trunk/extensions/Categorize/Categorize.i18n.php 2011-08-16 16:41:55 UTC (rev 94657) @@ -1,5 +1,4 @@ ?php - /** * Internationalisation file for extension Categorize. * @@ -8,7 +7,7 @@ * @author Andreas Rindler (mediawiki at jenandi dot com) and Thomas Fauré (faure dot thomas at gmail dot com) * @license GNU General Public Licence 3.0 * -*/ + */ $messages = array(); @@ -16,10 +15,10 @@ * @author Thomas Fauré */ $messages['en'] = array( - 'categorize-desc'= 'Adds input box to edit and upload page which allows users to assign categories to the page', + 'categorize-desc'= 'Adds an input box to edit and upload pages which allows users to assign categories', 'categorize-title' = 'Knowledge qualification', 'categorize-subtitle'= '', - 'categorize-footer' = 'If you want to add a label, please contact us at ...', + 'categorize-footer' = 'If you want to add a label, please contact an [[Special:ListUsers/sysop|administrator]].', 'categorize-advice' = 'Click on the labels you want to attribute to this page:' ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94658] trunk/extensions/Categorize
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94658
Revision: 94658
Author: siebrand
Date: 2011-08-16 16:43:39 + (Tue, 16 Aug 2011)
Log Message:
---
Stylize extension
Modified Paths:
--
trunk/extensions/Categorize/Categorize.api.php
trunk/extensions/Categorize/Categorize.body.php
trunk/extensions/Categorize/Categorize.css
trunk/extensions/Categorize/Categorize.hooks.php
trunk/extensions/Categorize/Categorize.js
trunk/extensions/Categorize/Categorize.php
trunk/extensions/Categorize/jquery.js
Modified: trunk/extensions/Categorize/Categorize.api.php
===
--- trunk/extensions/Categorize/Categorize.api.php 2011-08-16 16:41:55 UTC
(rev 94657)
+++ trunk/extensions/Categorize/Categorize.api.php 2011-08-16 16:43:39 UTC
(rev 94658)
@@ -35,21 +35,21 @@
$params = $this-extractRequestParams();
$strquery = $params['strquery'];
$result = $this-getResult();
-
- if(isset($strquery) $strquery != NULL) {
+
+ if ( isset( $strquery ) $strquery != NULL ) {
$searchString = str_replace( '%' , '\%' , $strquery );
$searchString = str_replace( '_' , '\_' , $searchString
);
$searchString = str_replace( '|' , '%' , $searchString
);
- $dbr = $this-getDB();;
-
+ $dbr = $this-getDB(); ;
+
$suggestStrings = array();
-
+
$this-addTables( 'categorylinks' );
$this-addFields( 'DISTINCT cl_to' );
- $this-addWhere ( UPPER(CONVERT(cl_to using latin1))
LIKE UPPER(CONVERT('$searchString%' using latin1)) );
+ $this-addWhere ( UPPER(CONVERT(cl_to using latin1))
LIKE UPPER(CONVERT('$searchString%' using latin1)) );
$res = $this-select( __METHOD__ );
while ( $row = $res-fetchObject() ) {
- array_push($suggestStrings,$row-cl_to);
+ array_push( $suggestStrings, $row-cl_to );
$fit = $result-addValue( array( 'query',
$this-getModuleName() ), null, $row-cl_to );
if ( !$fit ) {
$this-setContinueEnumParameter(
'start', wfTimestamp( TS_ISO_8601, $row-afl_timestamp ) );
@@ -78,7 +78,7 @@
public function getDescription() {
return 'Show categories beginning by strquery string.';
}
-
+
public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(), array(
// to fill
Modified: trunk/extensions/Categorize/Categorize.body.php
===
--- trunk/extensions/Categorize/Categorize.body.php 2011-08-16 16:41:55 UTC
(rev 94657)
+++ trunk/extensions/Categorize/Categorize.body.php 2011-08-16 16:43:39 UTC
(rev 94658)
@@ -2,13 +2,13 @@
/* Categorize Mediawiki Extension
*
* @author Andreas Rindler (mediawiki at jenandi dot com) for initial
Extension:CategorySuggest and Thomas Fauré (faure dot thomas at gmail dot com)
for Categorize improvments
- * @credits
+ * @credits
* @licence GNU General Public Licence 3.0
- * @description
+ * @description
*
*/
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
echo( This file is an extension to the MediaWiki software and cannot
be used standalone.\n );
die();
}
@@ -24,9 +24,9 @@
$m_pageText = $m_pageObj-textbox1;
$arrAllCats = Array();
- $regulartext ='';
+ $regulartext = '';
$nowikitext = '';
- $cleanedtext ='';
+ $cleanedtext = '';
$finaltext = '';
# Check linewise for category links:
# Get the first part of the text up until the first nowiki
tag.
@@ -34,31 +34,31 @@
$regulartext = $arrBlocks1[0];
# Get and strip categories from the first part
- $cleanedtext =
CategorizeBody::fnCategorizeStripCats($regulartext,$arrAllCats);
+ $cleanedtext = CategorizeBody::fnCategorizeStripCats(
$regulartext, $arrAllCats );
$finaltext .= $cleanedtext;
-
+
# Go through the rest of the blocks to find more categories
- for($i=1; $icount($arrBlocks1); $i++){
+ for ( $i = 1; $i count( $arrBlocks1 ); $i++ ) {
$arrBlocks2 = explode( /nowiki, $arrBlocks1[$i] );
- //ignore cats here because it is part of the nowiki
block
+ // ignore cats here because it is
[MediaWiki-CVS] SVN: [94659] trunk/extensions/Maps/includes/services/GoogleMaps3/jquery. googlemap.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94659
Revision: 94659
Author: jeroendedauw
Date: 2011-08-16 16:54:26 + (Tue, 16 Aug 2011)
Log Message:
---
fixed ge tilt
Modified Paths:
--
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
===
--- trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 16:43:39 UTC (rev 94658)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
2011-08-16 16:54:26 UTC (rev 94659)
@@ -228,14 +228,41 @@
mw.loader.using( 'ext.maps.gm3.earth',
function() {
if ( google.earth.isSupported()
) {
var ge = new
GoogleEarth( map );
+ var setTilt =
function() {
+ if (
ge.getInstance() !== undefined ) {
+var
center = map.getCenter();
+ var
lookAt = ge.instance_.createLookAt('');
+ var
range = Math.pow(2, GoogleEarth.MAX_EARTH_ZOOM_ - map.getZoom());
+
lookAt.setRange(range);
+
lookAt.setLatitude(center.lat());
+
lookAt.setLongitude(center.lng());
+
lookAt.setHeading(0);
+
lookAt.setAltitude(0);
+
+ //
Teleport to the pre-tilt view immediately.
+
ge.instance_.getOptions().setFlyToSpeed(5);
+
ge.instance_.getView().setAbstractView(lookAt);
+
lookAt.setTilt(options.tilt);
+ //
Fly to the tilt at regular speed in 200ms
+
ge.instance_.getOptions().setFlyToSpeed(0.75);
+
window.setTimeout(function() {
+
ge.instance_.getView().setAbstractView(lookAt);
+ },
200);
+ //
Set the flyto speed back to default after the animation starts.
+
window.setTimeout(function() {
+
ge.instance_.getOptions().setFlyToSpeed(1);
+ },
250);
+ }
+ else {
+
setTimeout( this, 100 );
+ }
+ };
- //var lookAt =
ge.getView().copyAsLookAt(ge.ALTITUDE_RELATIVE_TO_GROUND);
-
-
//lookAt.setTilt(lookAt.getTilt() + options.tilt);
-
//ge.getView().setAbstractView(lookAt);
+ setTilt();
}
+
_this.addOverlays();
-
map.setMapTypeId(GoogleEarth.MAP_TYPE_ID);
+ map.setMapTypeId(
GoogleEarth.MAP_TYPE_ID );
} );
} } );
}
[MediaWiki-CVS] SVN: [94660] trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove. defaultOptions.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94660
Revision: 94660
Author: kaldari
Date: 2011-08-16 17:01:36 + (Tue, 16 Aug 2011)
Log Message:
---
adding comments for people who copy to thier own JS
Modified Paths:
--
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.defaultOptions.js
Modified:
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.defaultOptions.js
===
---
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.defaultOptions.js
2011-08-16 16:54:26 UTC (rev 94659)
+++
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.defaultOptions.js
2011-08-16 17:01:36 UTC (rev 94660)
@@ -1,3 +1,5 @@
+//See http://www.mediawiki.org/wiki/Extension:WikiLove for basic documentation
on configuration.
+//nowiki
( function( $ ) {
$.wikiLoveOptions = {
defaultText: '{| style=background-color: $5; border: 1px solid $6;\n\
@@ -371,3 +373,4 @@
};
} )( jQuery );
+///nowiki
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94661] trunk/extensions/Translate/groups/Shapado/Shapado.yaml
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94661 Revision: 94661 Author: siebrand Date: 2011-08-16 17:05:51 + (Tue, 16 Aug 2011) Log Message: --- Update tags. Modified Paths: -- trunk/extensions/Translate/groups/Shapado/Shapado.yaml Modified: trunk/extensions/Translate/groups/Shapado/Shapado.yaml === --- trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 17:01:36 UTC (rev 94660) +++ trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 17:05:51 UTC (rev 94661) @@ -452,6 +452,13 @@ MANGLER: prefix: widgets- +TAGS: + ignored: +- widgets-widgets.settings.google_ad_client +- widgets-widgets.settings.google_ad_slot +- widgets-widgets.settings.google_ad_width +- widgets-widgets.settings.google_ad_height + --- BASIC: id: out-shapado-wiki ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94662] trunk/extensions/MobileFrontend/MobileFrontend.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94662
Revision: 94662
Author: preilly
Date: 2011-08-16 17:13:23 + (Tue, 16 Aug 2011)
Log Message:
---
fix for r94566
Modified Paths:
--
trunk/extensions/MobileFrontend/MobileFrontend.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 17:05:51 UTC
(rev 94661)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 17:13:23 UTC
(rev 94662)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.27';
+ const VERSION = '0.5.28';
/**
* @var DOMDocument
@@ -181,7 +181,7 @@
// The title
self::$title = $out-getTitle();
- if ( Title::newMainPage()-getArticleId() ===
self::$title-getArticleId() ) {
+ if ( Title::newMainPage()-equals( self::$title ) ) {
self::$isMainPage = true;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94663] branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94663
Revision: 94663
Author: preilly
Date: 2011-08-16 17:17:37 + (Tue, 16 Aug 2011)
Log Message:
---
mft r94662
Modified Paths:
--
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 17:13:23 UTC (rev 94662)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 17:17:37 UTC (rev 94663)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.27';
+ const VERSION = '0.5.28';
/**
* @var DOMDocument
@@ -181,7 +181,7 @@
// The title
self::$title = $out-getTitle();
- if ( Title::newMainPage()-getArticleId() ===
self::$title-getArticleId() ) {
+ if ( Title::newMainPage()-equals( self::$title ) ) {
self::$isMainPage = true;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94664] branches/wmf/1.17wmf1/extensions/CodeReview/backend/ CodeRevision.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94664
Revision: 94664
Author: demon
Date: 2011-08-16 17:30:21 + (Tue, 16 Aug 2011)
Log Message:
---
MFT r94506
Modified Paths:
--
branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
Property Changed:
branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
Modified: branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
===
--- branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
2011-08-16 17:17:37 UTC (rev 94663)
+++ branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
2011-08-16 17:30:21 UTC (rev 94664)
@@ -1241,10 +1241,11 @@
* @param string $commentId
* @return \type
*/
- public function getFullUrl( $commentId = '' ) {
+ public function getFullUrl( $commentId = 0 ) {
$title = SpecialPage::getTitleFor( 'Code',
$this-repo-getName() . '/' . $this-id );
- if ( $commentId !== '' ) {
+ # Append comment id if not null, empty string or zero
+ if ( $commentId ) {
$title-setFragment( #c{$commentId} );
}
Property changes on:
branches/wmf/1.17wmf1/extensions/CodeReview/backend/CodeRevision.php
___
Added: svn:mergeinfo
+ /backend/CodeRevision.php:91549
/branches/REL1_15/phase3/extensions/CodeReview/backend/CodeRevision.php:51646
/branches/new-installer/phase3/extensions/CodeReview/backend/CodeRevision.php:43664-66004
/branches/sqlite/extensions/CodeReview/backend/CodeRevision.php:58211-58321
/branches/wmf/1.16wmf4/extensions/CodeReview/backend/CodeRevision.php:67177,69199,76243,77266
/branches/wmf-deployment/extensions/CodeReview/backend/CodeRevision.php:60970
/trunk/extensions/CodeReview/backend/CodeRevision.php:77974-93070,94506
/trunk/phase3/extensions/CodeReview/backend/CodeRevision.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94665] branches/REL1_18/extensions/CodeReview
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94665
Revision: 94665
Author: demon
Date: 2011-08-16 17:33:39 + (Tue, 16 Aug 2011)
Log Message:
---
MFT r94506
Modified Paths:
--
branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
Property Changed:
branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
Modified: branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
===
--- branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
2011-08-16 17:30:21 UTC (rev 94664)
+++ branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
2011-08-16 17:33:39 UTC (rev 94665)
@@ -1241,10 +1241,11 @@
* @param string $commentId
* @return \type
*/
- public function getFullUrl( $commentId = '' ) {
+ public function getFullUrl( $commentId = 0 ) {
$title = SpecialPage::getTitleFor( 'Code',
$this-repo-getName() . '/' . $this-id );
- if ( $commentId !== '' ) {
+ # Append comment id if not null, empty string or zero
+ if ( $commentId ) {
$title-setFragment( #c{$commentId} );
}
Property changes on:
branches/REL1_18/extensions/CodeReview/backend/CodeRevision.php
___
Added: svn:mergeinfo
+ /backend/CodeRevision.php:91549
/trunk/extensions/CodeReview/backend/CodeRevision.php:94506
Modified: branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
===
--- branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
2011-08-16 17:30:21 UTC (rev 94664)
+++ branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
2011-08-16 17:33:39 UTC (rev 94665)
@@ -40,4 +40,28 @@
// $this-assertEquals( '', $formatter-link( '' ) );
}
-}
\ No newline at end of file
+
+ public function testCommentFullUrl() {
+ # Fixture:
+ $repo = $this-createRepo();
+ $cr = CodeRevision::newFromSvn( $repo, array(
+ 'rev'= 305,
+ 'author' = 'hashar',
+ 'date' = '15 august 2011',
+ 'msg'= 'dumb revision message',
+ 'paths' = array( '/dev/null' ),
+ )
+ );
+
+ # Find out our revision root URL
+ $baseUrl = SpecialPage::getTitleFor( 'Code',
$repo-getName().'/305' )-getFullUrl();
+
+ # Test revision URL with various comment id:
+ $this-assertEquals( $baseUrl, $cr-getFullUrl('' ) );
+ $this-assertEquals( $baseUrl, $cr-getFullUrl( 0 ) );
+ $this-assertEquals( $baseUrl, $cr-getFullUrl( null ) );
+ $this-assertEquals( $baseUrl, $cr-getFullUrl( 0 ) );
+ $this-assertEquals( $baseUrl . '#c777', $cr-getFullUrl( 777
) );
+ $this-assertEquals( $baseUrl . '#c777', $cr-getFullUrl( 777
) );
+ }
+}
Property changes on:
branches/REL1_18/extensions/CodeReview/tests/CodeReviewTest.php
___
Added: svn:mergeinfo
+ /tests/CodeReviewTest.php:91549
/trunk/extensions/CodeReview/tests/CodeReviewTest.php:94506
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94666] trunk/extensions/Maps/RELEASE-NOTES
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94666 Revision: 94666 Author: jeroendedauw Date: 2011-08-16 17:38:47 + (Tue, 16 Aug 2011) Log Message: --- up rel notes Modified Paths: -- trunk/extensions/Maps/RELEASE-NOTES Modified: trunk/extensions/Maps/RELEASE-NOTES === --- trunk/extensions/Maps/RELEASE-NOTES 2011-08-16 17:33:39 UTC (rev 94665) +++ trunk/extensions/Maps/RELEASE-NOTES 2011-08-16 17:38:47 UTC (rev 94666) @@ -18,8 +18,10 @@ * Minor improvement to script loading. -* Added experimental support for Google Earth in Google Maps v3. +* Added support for Google Earth in Google Maps v3. +* Added tilt parameter for Google Earth in Google Maps v3. + === Maps 1.0 === (2011-07-19) ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94667] trunk/tools/wsor/scripts/classes/WSORSlaveDataLoader.py
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94667
Revision: 94667
Author: rfaulk
Date: 2011-08-16 17:47:06 + (Tue, 16 Aug 2011)
Log Message:
---
modified construct_topic tree() to build trees from all top level categories
added find_top_level category() to determine categories from article page ids
added determine_all_page_categories() to categorize all pages
Modified Paths:
--
trunk/tools/wsor/scripts/classes/WSORSlaveDataLoader.py
Modified: trunk/tools/wsor/scripts/classes/WSORSlaveDataLoader.py
===
--- trunk/tools/wsor/scripts/classes/WSORSlaveDataLoader.py 2011-08-16
17:38:47 UTC (rev 94666)
+++ trunk/tools/wsor/scripts/classes/WSORSlaveDataLoader.py 2011-08-16
17:47:06 UTC (rev 94667)
@@ -12,18 +12,21 @@
Import python base modules
-import sys, getopt, re, datetime, logging, MySQLdb, settings, operator, pickle
+import sys, getopt, re, datetime, logging, MySQLdb, operator, pickle, shelve,
random
import networkx as nx
Import Analytics modules
from Fundraiser_Tools.classes.DataLoader import DataLoader
+import WSOR.scripts.classes.settings as settings
Configure the logger
LOGGING_STREAM = sys.stderr
logging.basicConfig(level=logging.DEBUG, stream=LOGGING_STREAM,
format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%b-%d %H:%M:%S')
+# logging.basicConfig(level=logging.DEBUG, filename=categories.log,
filemode='w', format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%b-%d
%H:%M:%S')
+
Inherits DataLoader
@@ -102,16 +105,31 @@
self._query_names_['build_subcat_tbl'] = CREATE TABLE
rfaulk.categorylinks_cp select * from enwiki.categorylinks where cl_type =
'subcat'
self._query_names_['drop_subcat_tbl'] = drop table if exists
rfaulk.categorylinks_cp;
self._query_names_['get_first_rec'] = select cl_from from
categorylinks_cp limit 1
-self._query_names_['get_category_page_title'] = select page_title
from enwiki.page where page_id = %s
+self._query_names_['get_category_page_title'] = select page_id,
page_title from enwiki.page where %s
self._query_names_['get_category_page_id'] = select page_id from
enwiki.page where page_title = '%s' and page_namespace = 14
self._query_names_['get_subcategories'] = select cl_to from
categorylinks_cp where cl_from = %s
self._query_names_['delete_from_recs'] = delete from
rfaulk.categorylinks_cp where cl_from = %s
self._query_names_['is_empty'] = select * from
rfaulk.categorylinks_cp limit 1
self._query_names_['get_category_links'] = select cl_from, cl_to from
categorylinks_cp
+self._query_names_['get_page_categories'] = select cl_from, cl_to
from enwiki.categorylinks where %s order by 1
+self._query_names_['get_all_page_ids'] = select page_id from
enwiki.page where page_namespace = 0 and page_len 1000
+self._query_names_['create_page_category'] = create table
rfaulk.page_category (page_id int(8) unsigned, page_title varbinary(255),
category varbinary(255));
+self._query_names_['drop_page_category'] = drop table if exists
rfaulk.page_category;
+self._query_names_['insert_page_category'] = insert into
rfaulk.page_category values %s;
+
+
WSORSlaveDataLoader.__init__(self)
logging.info('Creating CategoryLoader')
-
+
+self._max_depth_ = 100
+self._top_level_cats_ = ['Natural_sciences', 'Applied_sciences',
'Mathematics', 'Literature', 'Visual_arts', 'Social_sciences', 'Film', 'Music',
'Television', 'Biography', 'Religion', 'Culture', 'Philosophy', 'Sports',
'Places']
+# self._top_level_cats_ = ['Natural_sciences', 'Mathematics', 'Arts',
'Social_sciences', 'Entertainment', 'Biography', 'Religion', 'Culture',
'Philosophy', 'Sports']
+self._block_words_ = ['categories', 'Categories', 'topic', 'Topic']
+self._block_cats_ = ['']
+self._topic_trees_ = dict()
+
+
Retrieves all rows out of the category links table
@@ -129,8 +147,45 @@
return results
+
+Extract the categories for a given article
+
+def get_page_categories(self, page_id_list):
+
+categories = dict()
+where_clause = ''
+
+ Initialize category lists for each page
+for id in page_id_list:
+categories[id] = list()
+
+try:
+
+for id in page_id_list:
+where_clause = where_clause + 'cl_from = %s or ' % str(id)
+where_clause = where_clause[:-4]
+
+sql = self._query_names_['get_page_categories'] % where_clause
+
+logging.info('Retrieving page categories ...')
+results = self.execute_SQL(sql)
[MediaWiki-CVS] SVN: [94668] trunk/extensions/MobileFrontend
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94668
Revision: 94668
Author: preilly
Date: 2011-08-16 17:51:38 + (Tue, 16 Aug 2011)
Log Message:
---
fix for r94564
Modified Paths:
--
trunk/extensions/MobileFrontend/MobileFrontend.php
trunk/extensions/MobileFrontend/views/information/optin.html.php
trunk/extensions/MobileFrontend/views/information/optout.html.php
trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 17:47:06 UTC
(rev 94667)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 17:51:38 UTC
(rev 94668)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.28';
+ const VERSION = '0.5.29';
/**
* @var DOMDocument
@@ -119,7 +119,7 @@
public function addMobileFooter( $obj, $tpl ) {
global $wgRequest;
$footerlinks = $tpl-data['footerlinks'];
- $mobileViewUrl = $wgRequest-escapeAppendQuery(
'useFormat=mobile' );
+ $mobileViewUrl = $wgRequest-escapeAppendQuery(
'useformat=mobile' );
$tpl-set('mobileview', a href='{$mobileViewUrl}'.wfMsg(
'mobile-frontend-view')./a);
$footerlinks['places'][] = 'mobileview';
@@ -219,7 +219,7 @@
// Thus, globalized objects will not be available as expected
in the function.
// This is stated to be intended behavior, as per the
following: [http://bugs.php.net/bug.php?id=40104]
- $mAction = $wgRequest-getText( 'mAction' );
+ $mobileAction = $wgRequest-getText( 'mobileaction' );
$action = $wgRequest-getText( 'action' );
self::$disableImages = $wgRequest-getText( 'disableImages', 0
);
self::$enableImages = $wgRequest-getText( 'enableImages', 0 );
@@ -243,7 +243,7 @@
}
- self::$useFormat = $wgRequest-getText( 'useFormat' );
+ self::$useFormat = $wgRequest-getText( 'useformat' );
self::$format = $wgRequest-getText( 'format' );
self::$requestedSegment = $wgRequest-getText( 'seg', 0 );
self::$search = $wgRequest-getText( 'search' );
@@ -264,51 +264,38 @@
$this-contentFormat = 'WML';
}
- if ( $mAction == 'disable_mobile_site' ) {
+ if ( $mobileAction == 'disable_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderDisableMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_in_mobile_site' ) {
+ if ( $mobileAction == 'opt_in_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderOptInMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_out_mobile_site' ) {
+ if ( $mobileAction == 'opt_out_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderOptOutMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_in_cookie' ) {
+ if ( $mobileAction == 'opt_in_cookie' ) {
$this-setOptInOutCookie( '1' );
$this-disableCaching();
$location = Title::newMainPage()-getFullURL();
header( 'Location: ' . $location );
}
- if ( $mAction == 'opt_out_cookie' ) {
+ if ( $mobileAction == 'opt_out_cookie' ) {
$this-setOptInOutCookie( '' );
}
- // Note: Temporarily disabling this section for trial deployment
- // if ( is_array($props)
- // $mAction != 'view_normal_site'
- // $props['is_wireless_device'] === 'true'
- // $props['is_tablet'] === 'false' ) {
- // $this-disableCaching();
- // ob_start( array( $this, 'DOMParse' ) );
- // } elseif (self::$useFormat === 'mobile' ||
- //self::$useFormat === 'mobile-wap' ) {
- // $this-disableCaching();
- // ob_start( array( $this, 'DOMParse' ) );
- // }
-
// WURFL documentation:
http://wurfl.sourceforge.net/help_doc.php
[MediaWiki-CVS] SVN: [94669] branches/wmf/1.17wmf1/extensions/MobileFrontend
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94669
Revision: 94669
Author: preilly
Date: 2011-08-16 17:53:11 + (Tue, 16 Aug 2011)
Log Message:
---
mft r94668
Modified Paths:
--
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optin.html.php
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optout.html.php
branches/wmf/1.17wmf1/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 17:51:38 UTC (rev 94668)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 17:53:11 UTC (rev 94669)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.28';
+ const VERSION = '0.5.29';
/**
* @var DOMDocument
@@ -119,7 +119,7 @@
public function addMobileFooter( $obj, $tpl ) {
global $wgRequest;
$footerlinks = $tpl-data['footerlinks'];
- $mobileViewUrl = $wgRequest-escapeAppendQuery(
'useFormat=mobile' );
+ $mobileViewUrl = $wgRequest-escapeAppendQuery(
'useformat=mobile' );
$tpl-set('mobileview', a href='{$mobileViewUrl}'.wfMsg(
'mobile-frontend-view')./a);
$footerlinks['places'][] = 'mobileview';
@@ -219,7 +219,7 @@
// Thus, globalized objects will not be available as expected
in the function.
// This is stated to be intended behavior, as per the
following: [http://bugs.php.net/bug.php?id=40104]
- $mAction = $wgRequest-getText( 'mAction' );
+ $mobileAction = $wgRequest-getText( 'mobileaction' );
$action = $wgRequest-getText( 'action' );
self::$disableImages = $wgRequest-getText( 'disableImages', 0
);
self::$enableImages = $wgRequest-getText( 'enableImages', 0 );
@@ -243,7 +243,7 @@
}
- self::$useFormat = $wgRequest-getText( 'useFormat' );
+ self::$useFormat = $wgRequest-getText( 'useformat' );
self::$format = $wgRequest-getText( 'format' );
self::$requestedSegment = $wgRequest-getText( 'seg', 0 );
self::$search = $wgRequest-getText( 'search' );
@@ -264,51 +264,38 @@
$this-contentFormat = 'WML';
}
- if ( $mAction == 'disable_mobile_site' ) {
+ if ( $mobileAction == 'disable_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderDisableMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_in_mobile_site' ) {
+ if ( $mobileAction == 'opt_in_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderOptInMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_out_mobile_site' ) {
+ if ( $mobileAction == 'opt_out_mobile_site' ) {
if ( $this-contentFormat == 'XHTML' ) {
echo $this-renderOptOutMobileSiteXHTML();
exit();
}
}
- if ( $mAction == 'opt_in_cookie' ) {
+ if ( $mobileAction == 'opt_in_cookie' ) {
$this-setOptInOutCookie( '1' );
$this-disableCaching();
$location = Title::newMainPage()-getFullURL();
header( 'Location: ' . $location );
}
- if ( $mAction == 'opt_out_cookie' ) {
+ if ( $mobileAction == 'opt_out_cookie' ) {
$this-setOptInOutCookie( '' );
}
- // Note: Temporarily disabling this section for trial deployment
- // if ( is_array($props)
- // $mAction != 'view_normal_site'
- // $props['is_wireless_device'] === 'true'
- // $props['is_tablet'] === 'false' ) {
- // $this-disableCaching();
- // ob_start( array( $this, 'DOMParse' ) );
- // } elseif (self::$useFormat === 'mobile' ||
- //self::$useFormat === 'mobile-wap' ) {
- // $this-disableCaching();
- // ob_start( array( $this, 'DOMParse' ) );
-
[MediaWiki-CVS] SVN: [94670] trunk/phase3/includes/upload
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94670
Revision: 94670
Author: raindrift
Date: 2011-08-16 17:57:32 + (Tue, 16 Aug 2011)
Log Message:
---
Cleaning up little things, updates to code clarity, documentation fixes per
Catrope's suggestions.
followup to r94536, r94592, r94594
Modified Paths:
--
trunk/phase3/includes/upload/UploadBase.php
trunk/phase3/includes/upload/UploadFromStash.php
trunk/phase3/includes/upload/UploadStash.php
Modified: trunk/phase3/includes/upload/UploadBase.php
===
--- trunk/phase3/includes/upload/UploadBase.php 2011-08-16 17:53:11 UTC (rev
94669)
+++ trunk/phase3/includes/upload/UploadBase.php 2011-08-16 17:57:32 UTC (rev
94670)
@@ -742,7 +742,6 @@
* This method returns the file object, which also has a 'fileKey'
property which can be passed through a form or
* API request to find this stashed file again.
*
-* @param $key String: (optional) the file key used to find the file
info again. If not supplied, a key will be autogenerated.
* @return UploadStashFile stashed file
*/
public function stashFile() {
@@ -757,7 +756,6 @@
/**
* Stash a file in a temporary directory, returning a key which can be
used to find the file again. See stashFile().
*
-* @param $key String: (optional) the file key used to find the file
info again. If not supplied, a key will be autogenerated.
* @return String: file key
*/
public function stashFileGetKey() {
@@ -767,7 +765,6 @@
/**
* alias for stashFileGetKey, for backwards compatibility
*
-* @param $key String: (optional) the file key used to find the file
info again. If not supplied, a key will be autogenerated.
* @return String: file key
*/
public function stashSession() {
Modified: trunk/phase3/includes/upload/UploadFromStash.php
===
--- trunk/phase3/includes/upload/UploadFromStash.php2011-08-16 17:53:11 UTC
(rev 94669)
+++ trunk/phase3/includes/upload/UploadFromStash.php2011-08-16 17:57:32 UTC
(rev 94670)
@@ -38,7 +38,7 @@
public static function isValidKey( $key ) {
// this is checked in more detail in UploadStash
- return preg_match( UploadStash::KEY_FORMAT_REGEX, $key ) ? true
: false;
+ return (bool)preg_match( UploadStash::KEY_FORMAT_REGEX, $key );
}
/**
Modified: trunk/phase3/includes/upload/UploadStash.php
===
--- trunk/phase3/includes/upload/UploadStash.php2011-08-16 17:53:11 UTC
(rev 94669)
+++ trunk/phase3/includes/upload/UploadStash.php2011-08-16 17:57:32 UTC
(rev 94670)
@@ -96,7 +96,7 @@
if ( !isset( $this-fileMetadata[$key] ) ) {
if ( !$this-fetchFileMetadata( $key ) ) {
// If nothing was received, it's likely due to
replication lag. Check the master to see if the record is there.
- $this-fetchFileMetadata( $key, true );
+ $this-fetchFileMetadata( $key, DB_MASTER );
}
if ( !isset( $this-fileMetadata[$key] ) ) {
@@ -155,7 +155,6 @@
*
* @param $path String: path to file you want stashed
* @param $sourceType String: the type of upload that generated this
file (currently, I believe, 'file' or null)
-* @param $key String: optional, unique key for this file. Used for
directory hashing when storing, otherwise not important
* @throws UploadStashBadPathException
* @throws UploadStashFileException
* @throws UploadStashNotLoggedInException
@@ -248,7 +247,6 @@
'us_status' = 'finished'
);
- // if a row exists but previous checks on it passed, let the
current user take over this key.
$dbw-insert(
'uploadstash',
$this-fileMetadata[$key],
@@ -424,10 +422,10 @@
* @param $key String: key
* @return boolean
*/
- protected function fetchFileMetadata( $key, $readFromMaster = false ) {
+ protected function fetchFileMetadata( $key, $readFromDB = DB_SLAVE ) {
// populate $fileMetadata[$key]
$dbr = null;
- if( $readFromMaster ) {
+ if( $readFromDB === DB_MASTER ) {
// sometimes reading from the master is necessary, if
there's replication lag.
$dbr = $this-repo-getMasterDb();
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
[MediaWiki-CVS] SVN: [94671] trunk/extensions/TitleKey/rebuildTitleKeys.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94671
Revision: 94671
Author: demon
Date: 2011-08-16 18:09:33 + (Tue, 16 Aug 2011)
Log Message:
---
Minor tweaks to r94419: make batch size configurable, use
RUN_MAINTENANCE_IF_MAIN
Modified Paths:
--
trunk/extensions/TitleKey/rebuildTitleKeys.php
Modified: trunk/extensions/TitleKey/rebuildTitleKeys.php
===
--- trunk/extensions/TitleKey/rebuildTitleKeys.php 2011-08-16 17:57:32 UTC
(rev 94670)
+++ trunk/extensions/TitleKey/rebuildTitleKeys.php 2011-08-16 18:09:33 UTC
(rev 94671)
@@ -15,6 +15,7 @@
function __construct() {
parent::__construct();
$this-mDescription = Rebuilds titlekey table entries for all
pages in DB.;
+ $this-mBatchSize = 1000;
$this-addOption( 'start', 'Page ID to start from', false, true
);
}
@@ -24,10 +25,9 @@
$dbr = $this-getDB( DB_SLAVE );
$maxId = $dbr-selectField( 'page', 'MAX(page_id)', '',
__METHOD__ );
- $chunkSize = 1000;
$lastId = 0;
- for( ; $start = $maxId; $start += $chunkSize ) {
+ for( ; $start = $maxId; $start += $this-mBatchSize ) {
if( $start != 0 ) {
$this-output( ... $start...\n );
}
@@ -37,7 +37,7 @@
__METHOD__,
array(
'ORDER BY' = 'page_id',
- 'LIMIT' = $chunkSize ) );
+ 'LIMIT' = $this-mBatchSize ) );
$titles = array();
foreach( $result as $row ) {
@@ -60,4 +60,4 @@
}
$maintClass = 'RebuildTitleKeys';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94672] trunk/extensions/DonationInterface/payflowpro_gateway/ payflowpro_gateway.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94672 Revision: 94672 Author: jamesur Date: 2011-08-16 18:16:40 + (Tue, 16 Aug 2011) Log Message: --- updaing donor privacy policy link default Modified Paths: -- trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php Modified: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php === --- trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php 2011-08-16 18:09:33 UTC (rev 94671) +++ trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php 2011-08-16 18:16:40 UTC (rev 94672) @@ -101,7 +101,7 @@ 'payflowpro_gateway-otherways-alt' = 'There are a href=http://wikimediafoundation.org/wiki/Ways_to_Give/en;other ways to give/a, including by check.', 'payflowpro_gateway-otherways-short' = 'a href=http://wikimediafoundation.org/wiki/Ways_to_Give/en;Other ways to give/a', 'payflowpro_gateway-paypal' = 'Have a PayPal account? a href=$1/index.php/Special:PayflowProGateway?_cache_=truepaypal=truemasthead=noneform_name=$2text_template=2010/JimmyAppealLonglanguage=enutm_source=$3utm_medium=$4utm_campaign=$5Donate with PayPal/a.', - 'payflowpro_gateway-credit-storage-processing' = 'We do not store your credit card information, and your personal data is subject to our a href=http://wikimediafoundation.org/wiki/Donor_Privacy_Policy;privacy policy/a.', + 'payflowpro_gateway-credit-storage-processing' = 'We do not store your credit card information, and your personal data is subject to our a href=http://wikimediafoundation.org/wiki/Donor_policy;donor privacy policy/a.', 'payflowpro_gateway-token-mismatch' = 'Your session has expired. Please try filling out and submitting the form again.', 'payflowpro_gateway-cc-form-header-personal' = 'Billing information', 'payflowpro_gateway-cc-form-header-payment' = 'Payment information', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94673] trunk/phase3/tests/phpunit
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94673
Revision: 94673
Author: hashar
Date: 2011-08-16 18:23:13 + (Tue, 16 Aug 2011)
Log Message:
---
enable colors in PHPUnit (redoing r89179).
suite.xml now comes with colors=true. Under Windows, we override the
setting by forging a --no-colors. One can still force color usage
under windows by using --colors.
Modified Paths:
--
trunk/phase3/tests/phpunit/MediaWikiPHPUnitCommand.php
trunk/phase3/tests/phpunit/suite.xml
Modified: trunk/phase3/tests/phpunit/MediaWikiPHPUnitCommand.php
===
--- trunk/phase3/tests/phpunit/MediaWikiPHPUnitCommand.php 2011-08-16
18:16:40 UTC (rev 94672)
+++ trunk/phase3/tests/phpunit/MediaWikiPHPUnitCommand.php 2011-08-16
18:23:13 UTC (rev 94673)
@@ -17,6 +17,17 @@
public static function main( $exit = true ) {
$command = new self;
+
+ if( wfIsWindows() ) {
+ # Windows does not come anymore with ANSI.SYS loaded by
default
+ # PHPUnit uses the suite.xml parameters to
enable/disable colors
+ # which can be then forced to be enabled with --colors.
+ # The below code inject a parameter just like if the
user called
+ # phpunit with a --no-color option (which does not
exist). It
+ # overrides the suite.xml setting.
+ # Probably fix bug 29226
+ $command-arguments['colors'] = false;
+ }
$command-run($_SERVER['argv'], $exit);
}
Modified: trunk/phase3/tests/phpunit/suite.xml
===
--- trunk/phase3/tests/phpunit/suite.xml2011-08-16 18:16:40 UTC (rev
94672)
+++ trunk/phase3/tests/phpunit/suite.xml2011-08-16 18:23:13 UTC (rev
94673)
@@ -2,7 +2,7 @@
!-- colors don't work on Windows! --
phpunit bootstrap=./bootstrap.php
- colors=false
+ colors=true
backupGlobals=false
convertErrorsToExceptions=true
convertNoticesToExceptions=true
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94674] trunk/extensions/WikimediaIncubator/IncubatorTest.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94674
Revision: 94674
Author: robin
Date: 2011-08-16 18:41:57 + (Tue, 16 Aug 2011)
Log Message:
---
Use slash as second paramter for preg_quote(), per CR on r94482
Modified Paths:
--
trunk/extensions/WikimediaIncubator/IncubatorTest.php
Modified: trunk/extensions/WikimediaIncubator/IncubatorTest.php
===
--- trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-08-16
18:23:13 UTC (rev 94673)
+++ trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-08-16
18:41:57 UTC (rev 94674)
@@ -114,10 +114,10 @@
}
}
global $wmincProjects, $wmincSisterProjects;
- $listProjects = array_map( 'preg_quote', array_keys(
$wmincProjects ) );
+ $listProjects = array_map( 'self::preg_quote_slash',
array_keys( $wmincProjects ) );
if( $allowSister is_array( $wmincSisterProjects ) ) {
# join the project codes with those of the sister
projects
- $listSister = array_map( 'preg_quote', array_keys(
$wmincSisterProjects ) );
+ $listSister = array_map( 'self::preg_quote_slash',
array_keys( $wmincSisterProjects ) );
$listProjects = array_merge( $listProjects, $listSister
);
}
$listProjects = implode( '|', $listProjects );
@@ -283,7 +283,7 @@
global $wmincTestWikiNamespaces, $wmincProjectSite,
$wmincPseudoCategoryNSes;
$prefixdata = self::analyzePrefix( $title-getText() );
$ns = $title-getNamespace();
- $categories = array_map( 'preg_quote', $wmincPseudoCategoryNSes
);
+ $categories = array_map( 'self::preg_quote_slash',
$wmincPseudoCategoryNSes );
if( !$prefixdata['error'] ) {
# no error in prefix - no error to show
return false;
@@ -699,4 +699,8 @@
$pageLang = $prefix['lang'];
return true;
}
+
+ private static function preg_quote_slash( $str ) {
+ return preg_quote( $str, '/' );
+ }
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94675] trunk/phase3/languages/messages/MessagesEn.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94675 Revision: 94675 Author: hashar Date: 2011-08-16 19:07:10 + (Tue, 16 Aug 2011) Log Message: --- different wording from r83554. Modified Paths: -- trunk/phase3/languages/messages/MessagesEn.php Modified: trunk/phase3/languages/messages/MessagesEn.php === --- trunk/phase3/languages/messages/MessagesEn.php 2011-08-16 18:41:57 UTC (rev 94674) +++ trunk/phase3/languages/messages/MessagesEn.php 2011-08-16 19:07:10 UTC (rev 94675) @@ -4526,7 +4526,7 @@ 'specialpages-note' = ' * Normal special pages. * span class=mw-specialpagerestrictedRestricted special pages./span -* span class=mw-specialpagecachedCached-only special pages./span', +* span class=mw-specialpagecachedCached special pages (might be obsolete)./span', 'specialpages-group-maintenance' = 'Maintenance reports', 'specialpages-group-other' = 'Other special pages', 'specialpages-group-login' = 'Login / sign up', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94676] trunk/extensions/Translate/groups/Shapado/Shapado.yaml
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94676 Revision: 94676 Author: siebrand Date: 2011-08-16 19:13:40 + (Tue, 16 Aug 2011) Log Message: --- Update module support for Shapado. Modified Paths: -- trunk/extensions/Translate/groups/Shapado/Shapado.yaml Modified: trunk/extensions/Translate/groups/Shapado/Shapado.yaml === --- trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 19:07:10 UTC (rev 94675) +++ trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 19:13:40 UTC (rev 94676) @@ -44,6 +44,19 @@ --- BASIC: + id: out-shapado-activities + label: Shapado - Activities + display: out/shapado/activities + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/activities/%CODE%.yml + targetPattern: shapado/config/locales/activities/%CODE%.yml + +MANGLER: + prefix: activities- + +--- +BASIC: id: out-shapado-ads label: Shapado - Ads display: out/shapado/ads @@ -113,32 +126,45 @@ --- BASIC: - id: out-shapado-devise - label: Shapado - devise - display: out/shapado/devise + id: out-shapado-comments + label: Shapado - Comments + display: out/shapado/comments FILES: - sourcePattern: %GROUPROOT%/shapado/config/locales/devise/devise.%CODE%.yml - targetPattern: shapado/config/locales/devise/devise.%CODE%.yml + sourcePattern: %GROUPROOT%/shapado/config/locales/comments/%CODE%.yml + targetPattern: shapado/config/locales/comments/%CODE%.yml MANGLER: - prefix: devise- + prefix: comments- --- BASIC: - id: out-shapado-comments - label: Shapado - Comments - display: out/shapado/comments + id: out-shapado-constrainsconfig + label: Shapado - Constraints Config + display: out/shapado/constrainsconfig FILES: - sourcePattern: %GROUPROOT%/shapado/config/locales/comments/%CODE%.yml - targetPattern: shapado/config/locales/comments/%CODE%.yml + sourcePattern: %GROUPROOT%/shapado/config/locales/constrains_config/%CODE%.yml + targetPattern: shapado/config/locales/constrains_config/%CODE%.yml MANGLER: - prefix: comments- + prefix: constrainsconfig- --- BASIC: + id: out-shapado-devise + label: Shapado - devise + display: out/shapado/devise + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/devise/devise.%CODE%.yml + targetPattern: shapado/config/locales/devise/devise.%CODE%.yml + +MANGLER: + prefix: devise- + +--- +BASIC: id: out-shapado-doc label: Shapado - Doc display: out/shapado/doc @@ -226,10 +252,36 @@ targetPattern: shapado/config/locales/imports/%CODE%.yml MANGLER: - prefix: imports- + prefix: invitations- --- BASIC: + id: out-shapado-invitations + label: Shapado - Invitations + display: out/shapado/invitations + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/invitations/%CODE%.yml + targetPattern: shapado/config/locales/invitations/%CODE%.yml + +MANGLER: + prefix: invitations- + +--- +BASIC: + id: out-shapado-jobs + label: Shapado - Jobs + display: out/shapado/jobs + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/jobs/%CODE%.yml + targetPattern: shapado/config/locales/jobs/%CODE%.yml + +MANGLER: + prefix: jobs- + +--- +BASIC: id: out-shapado-layouts label: Shapado - Layouts display: out/shapado/layouts @@ -350,6 +402,19 @@ --- BASIC: + id: out-shapado-rewards + label: Shapado - Rewards + display: out/shapado/rewards + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/rewards/%CODE%.yml + targetPattern: shapado/config/locales/rewards/%CODE%.yml + +MANGLER: + prefix: rewards- + +--- +BASIC: id: out-shapado-searches label: Shapado - Searches display: out/shapado/searches @@ -389,6 +454,19 @@ --- BASIC: + id: out-shapado-themes + label: Shapado - Themes + display: out/shapado/themes + +FILES: + sourcePattern: %GROUPROOT%/shapado/config/locales/themes/%CODE%.yml + targetPattern: shapado/config/locales/themes/%CODE%.yml + +MANGLER: + prefix: themes- + +--- +BASIC: id: out-shapado-unfavorites label: Shapado - Unfavorites display: out/shapado/unfavorites ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94677] trunk/extensions/CentralNotice
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94677
Revision: 94677
Author: kaldari
Date: 2011-08-16 19:17:29 + (Tue, 16 Aug 2011)
Log Message:
---
more work on campaign log filtering
Modified Paths:
--
trunk/extensions/CentralNotice/CentralNotice.i18n.php
trunk/extensions/CentralNotice/CentralNoticeLogPager.php
trunk/extensions/CentralNotice/centralnotice.css
trunk/extensions/CentralNotice/centralnotice.js
trunk/extensions/CentralNotice/special/SpecialCentralNoticeLogs.php
Modified: trunk/extensions/CentralNotice/CentralNotice.i18n.php
===
--- trunk/extensions/CentralNotice/CentralNotice.i18n.php 2011-08-16
19:13:40 UTC (rev 94676)
+++ trunk/extensions/CentralNotice/CentralNotice.i18n.php 2011-08-16
19:17:29 UTC (rev 94677)
@@ -168,7 +168,7 @@
'centralnotice-landingpages' = 'Landing pages',
'centralnotice-banner-content' = 'Banner content',
'centralnotice-banner-content-changed' = 'Changed',
- 'centralnotice-filters' = 'Filters',
+ 'centralnotice-filters' = 'Log filters',
'centralnotice-date' = 'Date',
'centralnotice-apply-filters' = 'Apply filters',
'centralnotice-clear-filters' = 'Clear filters',
Modified: trunk/extensions/CentralNotice/CentralNoticeLogPager.php
===
--- trunk/extensions/CentralNotice/CentralNoticeLogPager.php2011-08-16
19:13:40 UTC (rev 94676)
+++ trunk/extensions/CentralNotice/CentralNoticeLogPager.php2011-08-16
19:17:29 UTC (rev 94677)
@@ -28,9 +28,15 @@
function getQueryInfo() {
global $wgRequest;
- $dateArray = $wgRequest-getArray( 'start' );
- $filterDate = $dateArray['year'] . $dateArray['month'] .
$dateArray['day'];
+ $filterDate = 0;
+ $year = $wgRequest-getVal( 'year' );
+ $month = $wgRequest-getVal( 'month' );
+ $day = $wgRequest-getVal( 'day' );
+ if ( $year !== 'other' $month !== 'other' $day !==
'other' ) {
+ $filterDate = $year . $month . $day;
+ }
$filterCampaign = $wgRequest-getVal( 'campaign' );
+ $filterUser = $wgRequest-getVal( 'user' );
$reset = $wgRequest-getVal( 'centralnoticelogreset' );
$info = array(
@@ -40,14 +46,19 @@
);
if ( !$reset ) {
- $date1 = intval( $filterDate.'00' );
- $date2 = intval( ( $filterDate + 1 ).'00' );
if ( $filterDate 0 ) {
+ $date1 = intval( $filterDate.'00' );
+ $date2 = intval( ( $filterDate + 1 ).'00' );
$info['conds'][] = notlog_timestamp = $date1
AND notlog_timestamp $date2;
}
if ( $filterCampaign ) {
$info['conds'][] = notlog_not_name LIKE
'$filterCampaign';
}
+ if ( $filterUser ) {
+ $user = User::newFromName( $filterUser );
+ $userId = $user-getId();
+ $info['conds'][] = notlog_user_id = $userId;
+ }
}
return $info;
@@ -77,9 +88,9 @@
$htmlOut .= Xml::openElement( 'td', array( 'valign' = 'top' )
);
if ( $row-notlog_action !== 'removed' ) {
- $htmlOut .= 'a
href=javascript:toggleDisplay(\''.$row-notlog_id.'\')'.
- 'img
src='.$wgExtensionAssetsPath.'/CentralNotice/collapsed.png
id=cn-collapsed-'.$row-notlog_id.'
style=display:block;vertical-align:baseline;/'.
- 'img
src='.$wgExtensionAssetsPath.'/CentralNotice/uncollapsed.png
id=cn-uncollapsed-'.$row-notlog_id.'
style=display:none;vertical-align:baseline;/'.
+ $htmlOut .= 'a
href=javascript:toggleLogDisplay(\''.$row-notlog_id.'\')'.
+ 'img
src='.$wgExtensionAssetsPath.'/CentralNotice/collapsed.png
id=cn-collapsed-'.$row-notlog_id.' style=display:block;/'.
+ 'img
src='.$wgExtensionAssetsPath.'/CentralNotice/uncollapsed.png
id=cn-uncollapsed-'.$row-notlog_id.' style=display:none;/'.
'/a';
}
$htmlOut .= Xml::closeElement( 'td' );
Modified: trunk/extensions/CentralNotice/centralnotice.css
===
--- trunk/extensions/CentralNotice/centralnotice.css2011-08-16 19:13:40 UTC
(rev 94676)
+++
[MediaWiki-CVS] SVN: [94678] trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94678
Revision: 94678
Author: demon
Date: 2011-08-16 19:18:07 + (Tue, 16 Aug 2011)
Log Message:
---
Remove ParserHelpers. NewParserTest still needs some cleanup, but it doesn't
rely on this. All tests still pass.
Removed Paths:
-
trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php
Deleted: trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php
===
--- trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php
2011-08-16 19:17:29 UTC (rev 94677)
+++ trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php
2011-08-16 19:18:07 UTC (rev 94678)
@@ -1,136 +0,0 @@
-?php
-
-class PHPUnitParserTest extends ParserTest {
- function showTesting( $desc ) {
- /* Do nothing since we don't want to show info during PHPUnit
testing. */
- }
-
- public function showSuccess( $desc ) {
- PHPUnit_Framework_Assert::assertTrue( true, $desc );
- return true;
- }
-
- public function showFailure( $desc, $expected, $got ) {
- PHPUnit_Framework_Assert::assertEquals( $expected, $got, $desc
);
- return false;
- }
-
- public function setupRecorder( $options ) {
- $this-recorder = new PHPUnitTestRecorder( $this );
- }
-}
-
-class ParserUnitTest extends MediaWikiTestCase {
- private $test = ;
-
- public function __construct( $suite, $test = null ) {
- parent::__construct();
- $this-test = $test;
- $this-suite = $suite;
- }
-
- function count() { return 1; }
-
- public function run( PHPUnit_Framework_TestResult $result = null ) {
- PHPUnit_Framework_Assert::resetCount();
- if ( $result === NULL ) {
- $result = new PHPUnit_Framework_TestResult;
- }
-
- $this-suite-publishTestArticles(); // Add articles needed by
the tests.
- $backend = new ParserTestSuiteBackend;
- $result-startTest( $this );
-
- // Support the transition to PHPUnit 3.5 where
PHPUnit_Util_Timer is replaced with PHP_Timer
- if ( class_exists( 'PHP_Timer' ) ) {
- PHP_Timer::start();
- } else {
- PHPUnit_Util_Timer::start();
- }
-
- $r = false;
- try {
- # Run the test.
- # On failure, the subclassed backend will throw an
exception with
- # the details.
- $pt = new PHPUnitParserTest;
- $r = $pt-runTest( $this-test['test'],
$this-test['input'],
- $this-test['result'], $this-test['options'],
$this-test['config']
- );
- }
- catch ( PHPUnit_Framework_AssertionFailedError $e ) {
-
- // PHPUnit_Util_Timer - PHP_Timer support (see above)
- if ( class_exists( 'PHP_Timer' ) ) {
- $result-addFailure( $this, $e,
PHP_Timer::stop() );
- } else {
- $result-addFailure( $this, $e,
PHPUnit_Util_Timer::stop() );
- }
- }
- catch ( Exception $e ) {
- // PHPUnit_Util_Timer - PHP_Timer support (see above)
- if ( class_exists( 'PHP_Timer' ) ) {
- $result-addFailure( $this, $e,
PHP_Timer::stop() );
- } else {
- $result-addFailure( $this, $e,
PHPUnit_Util_Timer::stop() );
- }
- }
-
- // PHPUnit_Util_Timer - PHP_Timer support (see above)
- if ( class_exists( 'PHP_Timer' ) ) {
- $result-endTest( $this, PHP_Timer::stop() );
- } else {
- $result-endTest( $this, PHPUnit_Util_Timer::stop() );
- }
-
- $backend-recorder-record( $this-test['test'], $r );
- $this-addToAssertionCount(
PHPUnit_Framework_Assert::getCount() );
-
- return $result;
- }
-
- public function toString() {
- return $this-test['test'];
- }
-
-}
-
-class ParserTestSuiteBackend extends PHPUnit_FrameWork_TestSuite {
- public $recorder;
- public $term;
- static $usePHPUnit = false;
-
- function __construct() {
- parent::__construct();
- $this-setupRecorder(null);
- self::$usePHPUnit = method_exists('PHPUnit_Framework_Assert',
'assertEquals');
- }
-
- function showTesting( $desc ) {
- }
-
- function showRunFile( $path ) {
-
[MediaWiki-CVS] SVN: [94679] trunk/phase3/tests
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94679 Revision: 94679 Author: demon Date: 2011-08-16 19:25:26 + (Tue, 16 Aug 2011) Log Message: --- Followup r94678: remove some include and autoload entries. tests still passing Modified Paths: -- trunk/phase3/tests/TestsAutoLoader.php trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php Modified: trunk/phase3/tests/TestsAutoLoader.php === --- trunk/phase3/tests/TestsAutoLoader.php 2011-08-16 19:18:07 UTC (rev 94678) +++ trunk/phase3/tests/TestsAutoLoader.php 2011-08-16 19:25:26 UTC (rev 94679) @@ -21,9 +21,6 @@ 'RandomImageGenerator' = $testFolder/phpunit/includes/api/RandomImageGenerator.php, 'UserWrapper' = $testFolder/phpunit/includes/api/ApiTestCase.php, - //Parser - 'ParserTestFileIterator' = $testFolder/phpunit/includes/parser/NewParserHelpers.php, - //Selenium 'SeleniumTestConstants' = $testFolder/selenium/SeleniumTestConstants.php, Modified: trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php === --- trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php 2011-08-16 19:18:07 UTC (rev 94678) +++ trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php 2011-08-16 19:25:26 UTC (rev 94679) @@ -1,6 +1,4 @@ ?php - -require_once( dirname( __FILE__ ) . '/ParserHelpers.php' ); require_once( dirname( __FILE__ ) . '/NewParserTest.php' ); /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94680] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94680
Revision: 94680
Author: robin
Date: 2011-08-16 19:29:52 + (Tue, 16 Aug 2011)
Log Message:
---
Magic words (time and number-formatting ones, plus DIRECTIONMARK, but not
NAMESPACE) now depend on the page content language instead of the site
language. In theory this sets the right magic words in system messages,
although they are not used there.
Useful for multilingual wikis like Incubator, and probably for extensions like
Translate.
Modified Paths:
--
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/parser/Parser.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===
--- trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 19:25:26 UTC (rev 94679)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 19:29:52 UTC (rev 94680)
@@ -36,6 +36,9 @@
* Most presentational html attributes like valign are now converted to inline
css style rules. These attributes were removed from html5 and so we clean
them up
when $wgHtml5 is enabled. This can be disabled using
$wgCleanupPresentationalAttributes.
+* Magic words (time and number-formatting ones, plus DIRECTIONMARK, but not
NAMESPACE)
+ now depend on the page content language instead of the site language. In
theory
+ this sets the right magic words in system messages, although they are not
used there.
=== Bug fixes in 1.19 ===
* $wgUploadNavigationUrl should be used for file redlinks if
Modified: trunk/phase3/includes/parser/Parser.php
===
--- trunk/phase3/includes/parser/Parser.php 2011-08-16 19:25:26 UTC (rev
94679)
+++ trunk/phase3/includes/parser/Parser.php 2011-08-16 19:29:52 UTC (rev
94680)
@@ -2694,48 +2694,50 @@
date_default_timezone_set( $oldtz );
}
+ $pageLang = $this-getFunctionLang();
+
switch ( $index ) {
case 'currentmonth':
- $value = $wgContLang-formatNum( gmdate( 'm',
$ts ) );
+ $value = $pageLang-formatNum( gmdate( 'm', $ts
) );
break;
case 'currentmonth1':
- $value = $wgContLang-formatNum( gmdate( 'n',
$ts ) );
+ $value = $pageLang-formatNum( gmdate( 'n', $ts
) );
break;
case 'currentmonthname':
- $value = $wgContLang-getMonthName( gmdate(
'n', $ts ) );
+ $value = $pageLang-getMonthName( gmdate( 'n',
$ts ) );
break;
case 'currentmonthnamegen':
- $value = $wgContLang-getMonthNameGen( gmdate(
'n', $ts ) );
+ $value = $pageLang-getMonthNameGen( gmdate(
'n', $ts ) );
break;
case 'currentmonthabbrev':
- $value = $wgContLang-getMonthAbbreviation(
gmdate( 'n', $ts ) );
+ $value = $pageLang-getMonthAbbreviation(
gmdate( 'n', $ts ) );
break;
case 'currentday':
- $value = $wgContLang-formatNum( gmdate( 'j',
$ts ) );
+ $value = $pageLang-formatNum( gmdate( 'j', $ts
) );
break;
case 'currentday2':
- $value = $wgContLang-formatNum( gmdate( 'd',
$ts ) );
+ $value = $pageLang-formatNum( gmdate( 'd', $ts
) );
break;
case 'localmonth':
- $value = $wgContLang-formatNum( $localMonth );
+ $value = $pageLang-formatNum( $localMonth );
break;
case 'localmonth1':
- $value = $wgContLang-formatNum( $localMonth1 );
+ $value = $pageLang-formatNum( $localMonth1 );
break;
case 'localmonthname':
- $value = $wgContLang-getMonthName(
$localMonthName );
+ $value = $pageLang-getMonthName(
$localMonthName );
break;
case 'localmonthnamegen':
- $value = $wgContLang-getMonthNameGen(
$localMonthName );
+ $value = $pageLang-getMonthNameGen(
$localMonthName );
break;
case 'localmonthabbrev':
- $value = $wgContLang-getMonthAbbreviation(
[MediaWiki-CVS] SVN: [94681] trunk/phase3/tests/qunit/suites/resources/jquery/jquery. highlightText.test.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94681
Revision: 94681
Author: brion
Date: 2011-08-16 19:34:47 + (Tue, 16 Aug 2011)
Log Message:
---
Followup r94609: fix jquery.highlightText test cases on IE, simplify test case
setup so new ones can be added more trivially, uncommented the failing test
case.
These tests were failing on IE 6, 7, and 8 because the innerHTML rendering of
the highlighted text came out in caps and without quotes, such that the string
didn't match the provided one. By re-normalizing the expected HTML form this
check now works on those browsers. Switching common code to a loop and an array
makes it easier to add new test cases: less duplication of code, and no need to
manually update the number of test cases.
Note that the third test case was previously commented out, but looks like a
serious regression. No longer commented out, so this will fail!
Modified Paths:
--
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
Modified:
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
===
---
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
2011-08-16 19:29:52 UTC (rev 94680)
+++
trunk/phase3/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js
2011-08-16 19:34:47 UTC (rev 94681)
@@ -6,32 +6,34 @@
} );
test( 'Check', function() {
- expect(2);
+ var cases = [
+ {
+ text: 'Blue Öyster Cult',
+ highlight: 'Blue',
+ expected: 'span class=highlightBlue/span Öyster
Cult'
+ },
+ {
+ text: 'Österreich',
+ highlight: 'Österreich',
+ expected: 'span class=highlightÖsterreich/span'
+ },
+ {
+ desc: 'Highlighter broken on punctuation mark',
+ text: 'So good. To be there',
+ highlight: 'good',
+ expected: 'So span class=highlightgood/span. To
be there'
+ }
+ ];
+ expect(cases.length);
var $fixture;
- $fixture = $( 'pBlue Öyster Cult/p' );
- $fixture.highlightText( 'Blue' );
- equal(
- 'span class=highlightBlue/span Öyster Cult',
- $fixture.html()
- );
-
- $fixture = $( 'pÖsterreich/p' );
- $fixture.highlightText( 'Österreich' );
- equal(
- 'span class=highlightÖsterreich/span',
- $fixture.html()
- );
-
- /**
-* Highlighter broken on punctuation mark.
-*/
- /** dont forget to update the value in expect() at the top!
- $fixture = $( 'pSo good. To be there/p' );
- $fixture.highlightText( 'good' );
- equal(
- 'So span class=highlightgood/span. To be there',
- $fixture.html()
- );
- */
+ $.each(cases, function( i, item ) {
+ $fixture = $( 'p/p' ).text( item.text );
+ $fixture.highlightText( item.highlight );
+ equals(
+ $fixture.html(),
+ $('p' + item.expected + '/p').html(), // re-parse
to normalize!
+ item.desc || undefined
+ );
+ } );
} );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94682] branches/SkinSystemRewrite/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94682 Revision: 94682 Author: ashley Date: 2011-08-16 19:49:19 + (Tue, 16 Aug 2011) Log Message: --- remove SkinSystemRewrite branch; reverts r62306, r62772 and r62828 Removed Paths: - branches/SkinSystemRewrite/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94683] trunk/extensions/LandingCheck/SpecialLandingCheck.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94683 Revision: 94683 Author: jamesur Date: 2011-08-16 20:33:24 + (Tue, 16 Aug 2011) Log Message: --- pass user language through to landing page query string when going through landing check. Default's to en if nothing given. Modified Paths: -- trunk/extensions/LandingCheck/SpecialLandingCheck.php Modified: trunk/extensions/LandingCheck/SpecialLandingCheck.php === --- trunk/extensions/LandingCheck/SpecialLandingCheck.php 2011-08-16 19:49:19 UTC (rev 94682) +++ trunk/extensions/LandingCheck/SpecialLandingCheck.php 2011-08-16 20:33:24 UTC (rev 94683) @@ -42,6 +42,7 @@ 'utm_source' = $wgRequest-getVal( 'utm_source' ), 'utm_medium' = $wgRequest-getVal( 'utm_medium' ), 'utm_campaign' = $wgRequest-getVal( 'utm_campaign' ), +'language' = $wgRequest-getVal( 'language', 'en'), 'country' = $country, 'referrer' = $wgRequest-getHeader( 'referer' ) ) ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94684] trunk/extensions/MobileFrontend/MobileFrontend.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94684
Revision: 94684
Author: preilly
Date: 2011-08-16 20:43:12 + (Tue, 16 Aug 2011)
Log Message:
---
remove more metadata
Modified Paths:
--
trunk/extensions/MobileFrontend/MobileFrontend.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 20:33:24 UTC
(rev 94683)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-16 20:43:12 UTC
(rev 94684)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.29';
+ const VERSION = '0.5.30';
/**
* @var DOMDocument
@@ -94,6 +94,7 @@
'#catlinks', # category links
'div.stub', # stub warnings
'table.metadata', # ugly metadata
+ '.metadata mbox-small',
'form',
'div.sister-project',
'script',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94685] branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94685
Revision: 94685
Author: preilly
Date: 2011-08-16 20:43:56 + (Tue, 16 Aug 2011)
Log Message:
---
mft r94684
Modified Paths:
--
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 20:43:12 UTC (rev 94684)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-16 20:43:56 UTC (rev 94685)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( $wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.29';
+ const VERSION = '0.5.30';
/**
* @var DOMDocument
@@ -94,6 +94,7 @@
'#catlinks', # category links
'div.stub', # stub warnings
'table.metadata', # ugly metadata
+ '.metadata mbox-small',
'form',
'div.sister-project',
'script',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94686] trunk/extensions/SemanticMediaWiki/specials
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94686
Revision: 94686
Author: jeroendedauw
Date: 2011-08-16 20:52:07 + (Tue, 16 Aug 2011)
Log Message:
---
fix strict warning
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialSearchByProperty.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 20:43:56 UTC (rev 94685)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-16 20:52:07 UTC (rev 94686)
@@ -144,7 +144,7 @@
protected function enableJQuery() {
global $wgOut, $smwgJQueryIncluded, $smwgScriptPath;
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage',
'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery'
);
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
===
--- trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
2011-08-16 20:43:56 UTC (rev 94685)
+++ trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
2011-08-16 20:52:07 UTC (rev 94686)
@@ -180,7 +180,7 @@
$scripts = array();
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
Modified:
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
===
---
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
2011-08-16 20:43:56 UTC (rev 94685)
+++
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
2011-08-16 20:52:07 UTC (rev 94686)
@@ -401,7 +401,7 @@
$scripts = array();
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
Modified:
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialSearchByProperty.php
===
---
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialSearchByProperty.php
2011-08-16 20:43:56 UTC (rev 94685)
+++
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialSearchByProperty.php
2011-08-16 20:52:07 UTC (rev 94686)
@@ -424,7 +424,7 @@
$scripts = array();
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94688] trunk/extensions/SemanticSignup/SemanticSignup.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94688
Revision: 94688
Author: jeroendedauw
Date: 2011-08-16 20:55:39 + (Tue, 16 Aug 2011)
Log Message:
---
oops, min SMW is 1.5, not 1.6
Modified Paths:
--
trunk/extensions/SemanticSignup/SemanticSignup.php
Modified: trunk/extensions/SemanticSignup/SemanticSignup.php
===
--- trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 20:54:19 UTC
(rev 94687)
+++ trunk/extensions/SemanticSignup/SemanticSignup.php 2011-08-16 20:55:39 UTC
(rev 94688)
@@ -32,15 +32,15 @@
die( 'bError:/b You need to have a
href=http://semantic-mediawiki.org/wiki/Semantic_MediaWiki;Semantic
MediaWiki/a installed in order to use SemanticSignup.' );
}
-if ( version_compare( SMW_VERSION, '1.6 alpha', '' ) ) {
- die( 'bError:/b Semantic Signup requires Semantic MediaWiki 1.6 or
above.' );
+if ( version_compare( SMW_VERSION, '1.5 alpha', '' ) ) {
+ die( 'bError:/b Semantic Signup requires Semantic MediaWiki 1.5 or
above.' );
}
if ( !defined( 'SF_VERSION' ) ) {
die( 'bError:/b You need to have a
href=http://semantic-mediawiki.org/wiki/Semantic_Forms;Semantic Forms/a
installed in order to use SemanticSignup.' );
}
-define( 'SemanticSignup_VERSION', '0.4.1 alpha' );
+define( 'SemanticSignup_VERSION', '0.4 alpha' );
$wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' :
'specialpage'][] = array(
'path' = __FILE__,
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94689] branches/wmf/1.17wmf1/languages/messages/MessagesEn.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94689
Revision: 94689
Author: siebrand
Date: 2011-08-16 21:16:18 + (Tue, 16 Aug 2011)
Log Message:
---
Merge compatible trunk messages to 1.17wmf1 so that LocalisationUpdate can
fetch translations again for some 25 messages.
Modified Paths:
--
branches/wmf/1.17wmf1/languages/messages/MessagesEn.php
Modified: branches/wmf/1.17wmf1/languages/messages/MessagesEn.php
===
--- branches/wmf/1.17wmf1/languages/messages/MessagesEn.php 2011-08-16
20:55:39 UTC (rev 94688)
+++ branches/wmf/1.17wmf1/languages/messages/MessagesEn.php 2011-08-16
21:16:18 UTC (rev 94689)
@@ -789,7 +789,7 @@
'vector-action-move' = 'Move',
'vector-action-protect' = 'Protect',
'vector-action-undelete' = 'Undelete',
-'vector-action-unprotect'= 'Unprotect',
+'vector-action-unprotect'= 'Change protection',
'vector-simplesearch-preference' = 'Enable enhanced search suggestions
(Vector skin only)',
'vector-view-create' = 'Create',
'vector-view-edit' = 'Edit',
@@ -825,8 +825,8 @@
'protect' = 'Protect',
'protect_change'= 'change',
'protectthispage' = 'Protect this page',
-'unprotect' = 'Unprotect',
-'unprotectthispage' = 'Unprotect this page',
+'unprotect' = 'Change protection',
+'unprotectthispage' = 'Change protection of this page',
'newpage' = 'New page',
'talkpage' = 'Discuss this page',
'talkpagelinktext' = 'Talk',
@@ -1078,7 +1078,7 @@
'nosuchuser' = 'There is no user by the name $1.
Usernames are case sensitive.
Check your spelling, or [[Special:UserLogin/signup|create a new account]].',
-'nosuchusershort'= 'There is no user by the name
nowiki$1/nowiki.
+'nosuchusershort'= 'There is no user by the name $1.
Check your spelling.',
'nouserspecified'= 'You have to specify a username.',
'login-userblocked' = 'This user is blocked. Login not allowed.',
@@ -1146,7 +1146,7 @@
# E-mail sending
'pear-mail-error'= '$1', # do not translate or duplicate this message
to other languages
'php-mail-error' = '$1', # do not translate or duplicate this message
to other languages
-'php-mail-error-unknown' = Unknown error in PHP's mail() function,
+'php-mail-error-unknown' = Unknown error in PHP's mail() function.,
# Password reset dialog
'resetpass' = 'Change password',
@@ -1279,11 +1279,12 @@
'userpage-userdoesnotexist-view' = 'User account $1 is not registered.',
'blocked-notice-logextract'= 'This user is currently blocked.
The latest block log entry is provided below for reference:',
-'clearyourcache' = '''Note: After saving, you may have to
bypass your browser's cache to see the changes.'''
-'''Mozilla / Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or
press either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Macintosh);
-'''Konqueror: '''click ''Reload'' or press ''F5'';
-'''Opera:''' clear the cache in ''Tools → Preferences'';
-'''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh,'' or press
''Ctrl-F5''.,
+'clearyourcache' = '''Note:''' After saving, you may have
to bypass your browser's cache to see the changes.
+* '''Firefox / Safari:''' hold ''Shift'' while clicking ''Reload'', or press
either ''Ctrl-F5'' or ''Ctrl-R'' (''Command-R'' on a Mac)
+* '''Google Chrome:''' press ''Ctrl-Shift-R'' (''Command-Shift-R'' on a Mac)
+* '''Internet Explorer:''' hold ''Ctrl'' while clicking ''Refresh'', or press
''Ctrl-F5''
+* '''Konqueror:''' click ''Reload'' or press ''F5''
+* '''Opera:''' clear the cache in ''Tools → Preferences'',
'usercssyoucanpreview' = '''Tip:''' Use the
\{{int:showpreview}}\ button to test your new CSS before saving.,
'userjsyoucanpreview' = '''Tip:''' Use the
\{{int:showpreview}}\ button to test your new JavaScript before saving.,
'usercsspreview' = '''Remember that you are only
previewing your user CSS.'''
@@ -1450,7 +1451,7 @@
Try [[Special:Search|searching on the wiki]] for relevant new pages.',
# Revision deletion
-'rev-deleted-comment' = '(comment removed)',
+'rev-deleted-comment' = '(edit summary removed)',
'rev-deleted-user'= '(username removed)',
'rev-deleted-event' = '(log action removed)',
'rev-deleted-user-contribs' = '[username or IP address removed - edit
hidden from contributions]',
@@ -1675,16 +1676,16 @@
You can search via Google in the meantime.
Note that their indexes of {{SITENAME}} content may be out of date.',
'googlesearch' = 'form method=get
action=http://www.google.com/search; id=googlesearch
-input type=hidden name=domains value={{SERVER}} /
-input type=hidden name=num value=50 /
-input type=hidden
[MediaWiki-CVS] SVN: [94690] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94690
Revision: 94690
Author: siebrand
Date: 2011-08-16 21:29:39 + (Tue, 16 Aug 2011)
Log Message:
---
Add new language Chimborazo Highland Quichua (qug).
Modified Paths:
--
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/languages/Names.php
Added Paths:
---
trunk/phase3/languages/messages/MessagesQug.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===
--- trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 21:16:18 UTC (rev 94689)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 21:29:39 UTC (rev 94690)
@@ -75,6 +75,7 @@
regularly. Below only new and removed languages are listed, as well as
changes to languages because of Bugzilla reports.
+* Chimborazo Highland Quichua (qug) (new).
* Uighur (Latin) (ug-latn) was incorrectly marked as right-to-left language.
=== Other changes in 1.19 ===
Modified: trunk/phase3/languages/Names.php
===
--- trunk/phase3/languages/Names.php2011-08-16 21:16:18 UTC (rev 94689)
+++ trunk/phase3/languages/Names.php2011-08-16 21:29:39 UTC (rev 94690)
@@ -272,6 +272,7 @@
'pt' = 'Português',# Portuguese
'pt-br' = 'Português do Brasil', # Brazilian Portuguese
'qu' = 'Runa Simi',# Southern Quechua
+ 'qug' = 'Runa shimi', # Chimborazo Highland Quichua
'rgn' = 'Rumagnôl',# Romagnol
'rif' = 'Tarifit', # Tarifit
'rm' = 'Rumantsch',# Raeto-Romance
Added: trunk/phase3/languages/messages/MessagesQug.php
===
--- trunk/phase3/languages/messages/MessagesQug.php
(rev 0)
+++ trunk/phase3/languages/messages/MessagesQug.php 2011-08-16 21:29:39 UTC
(rev 94690)
@@ -0,0 +1,749 @@
+?php
+/** Runa shimi (Chimborazo Highland Quichua)
+ *
+ * See MessagesQqq.php for message documentation incl. usage of parameters
+ * To improve a translation please visit http://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author AlimanRuna
+ * @author Ebe123
+ * @author Sylvain2803
+ */
+
+$fallback = 'qu';
+
+$messages = array(
+# Dates
+'sunday'= 'Hawkay',
+'monday'= 'Sullka',
+'tuesday' = 'Kulla',
+'wednesday' = 'Haway',
+'thursday' = 'Patma',
+'friday'= 'Haycha',
+'saturday' = 'Tinki',
+'sun' = 'Dom',
+'mon' = 'Lun',
+'tue' = 'Mar',
+'wed' = 'Mie',
+'thu' = 'Jue',
+'fri' = 'Vie',
+'sat' = 'Sab',
+'january' = 'Kamay',
+'february' = 'Panchiy',
+'march' = 'Pawkar',
+'april' = 'Ayriwa',
+'may_long' = 'Aymuray',
+'june' = 'Inti',
+'july' = 'Purun',
+'august'= 'Chakmay',
+'september' = 'Kuya',
+'october' = 'Yaku',
+'november' = 'Ayar',
+'december' = 'Kapak',
+'january-gen' = 'Kamay',
+'february-gen' = 'Panchiy',
+'march-gen' = 'Pawkar',
+'april-gen' = 'Ayriwa',
+'may-gen' = 'Aymuray',
+'june-gen' = 'Inti',
+'july-gen' = 'Purun',
+'august-gen'= 'Chakmay',
+'september-gen' = 'Kuya',
+'october-gen' = 'Yaku',
+'november-gen' = 'Ayar',
+'december-gen' = 'Kapak',
+'jan' = 'Kam',
+'feb' = 'Pan',
+'mar' = 'Paw',
+'apr' = 'Ayri',
+'may' = 'Aymu',
+'jun' = 'Inti',
+'jul' = 'Pur',
+'aug' = 'Chak',
+'sep' = 'Kuya',
+'oct' = 'Yaku',
+'nov' = 'Ayar',
+'dec' = 'Kap',
+
+# Categories related messages
+'pagecategories' = '{{PLURAL:$1|Katiguriya|Katiguriyakuna}}',
+'category_header'= '$1 katiguriyapi tiyak pankakuna',
+'subcategories' = 'Uchilla katikuriyakuna',
+'category-media-header' = '$1 katiguriyapi tiyak archiwukuna',
+'category-empty' = ''Kay katiguriyapi nimata tiyanchu.'',
+'hidden-categories' = '{{PLURAL:$1|Pakashka katiguriya|Pakashka
katiguriyakuna}}',
+'category-subcat-count' = '{{PLURAL:$2|Kay katikuriyaka shuklla ushi
katikuriyata charin :|Kay katiguriyaka kay katik {{PLURAL:$1|ushi
katikuriyata|$1 ushi katikuriyakunata}} charinmi, $2-pura.}}',
+'category-article-count' = '{{PLURAL:$2|Kay katiguriyapi shuklla pankaka
tiyanmi.|Kay katiguriyapi kay katik {{PLURAL:$1|panka|$1 pankakunaka}} tiyanmi,
$2-pura.}}',
+'category-file-count'= '{{PLURAL:$2|Kay katiguriyapi shuklla archiwuka
tiyanmi.|Kay katiguriyapi kay katik {{PLURAL:$1|archiwu|$1 archiwukunaka}}
tiyanmi, $2-pura.}}',
+'listingcontinuesabbrev' = 'katiy',
+'noindex-category' = 'Googlepak pakashka pankakuna (__NOINDEX__ charik
pankakuna)',
+
+'about' = 'Pankamanta',
+'newwindow' = '(Shuk mushuk wintanapi pakan)',
+'cancel' = 'Ama nina',
+'mytalk' = 'Ñukapak rimanakuy',
+'navigation' = 'Wampuna',
+
+# Cologne Blue skin
[MediaWiki-CVS] SVN: [94691] trunk/phase3/RELEASE-NOTES-1.19
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94691 Revision: 94691 Author: siebrand Date: 2011-08-16 21:30:23 + (Tue, 16 Aug 2011) Log Message: --- Break lines at or before 80 and update punctuation. Modified Paths: -- trunk/phase3/RELEASE-NOTES-1.19 Modified: trunk/phase3/RELEASE-NOTES-1.19 === --- trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 21:29:39 UTC (rev 94690) +++ trunk/phase3/RELEASE-NOTES-1.19 2011-08-16 21:30:23 UTC (rev 94691) @@ -28,17 +28,17 @@ * (bug 15558) Parameters to special pages included in wikitext can now be passed as with templates. * Installer now issues a warning if mod_security is present. -* (bug 29455) Add support for a filter callback function in jQuery byteLimit plugin. +* (bug 29455) Add support for a filter callback function in jQuery byteLimit + plugin. * Extensions can now participate in the extraction of titles from url paths -* Added two new GetLocalURL hooks to better serve extensions working on a limited - type of titles. -* Added a --no-updates flag to importDump.php that skips updating the links tables. +* Added two new GetLocalURL hooks to better serve extensions working on a + limited type of titles. +* Added a --no-updates flag to importDump.php that skips updating the links + tables. * Most presentational html attributes like valign are now converted to inline - css style rules. These attributes were removed from html5 and so we clean them up - when $wgHtml5 is enabled. This can be disabled using $wgCleanupPresentationalAttributes. -* Magic words (time and number-formatting ones, plus DIRECTIONMARK, but not NAMESPACE) - now depend on the page content language instead of the site language. In theory - this sets the right magic words in system messages, although they are not used there. + css style rules. These attributes were removed from html5 and so we clean + them up when $wgHtml5 is enabled. This can be disabled using + $wgCleanupPresentationalAttributes. === Bug fixes in 1.19 === * $wgUploadNavigationUrl should be used for file redlinks if @@ -48,14 +48,15 @@ * (bug 27894) Move 'editondblclick' event listener down from body to div#bodyContent. * (bug 30172) The check for posix_isatty() in maintenance scripts did not detect - when the function exists but is disabled. Introduced Maintenance::posix_isatty() -* (bug 30264) Changed installer-generated LocalSettings.php to use require_once() - instead require() for included extensions. + when the function exists but is disabled. Introduced + Maintenance::posix_isatty(). +* (bug 30264) Changed installer-generated LocalSettings.php to use + require_once() instead require() for included extensions. * Do not convert text in the user interface language to another script. * (bug 26283) Previewing user JS/CSS pages doesn't load other user JS/CSS pages * (bug 11374) Improved diff readability for colorblind people. * (bug 26486) ResourceLoader modules with paths to nonexistent files cause PHP - warnings/notices to be thrown + warnings/notices to be thrown. === API changes in 1.19 === * (bug 19838) siprop=interwikimap can now use the interwiki cache. @@ -64,10 +65,11 @@ * (bug 29685) do not output NULL parentid with list=deletedrevsdrprop=parentid. * siprop=interwikimap and siprop=languages can use silanguagecode to have a best effort language name translation. Use CLDR extension for best result. -* (bug 30230) action=expandtemplates should not silently override invalid title inputs -* (bug 18634) Create API to fetch MediaWiki's language fallback tree structure -* (bug 26885) Allow show/hide of account blocks, temporary blocks and single IP blocks - for list=blocks +* (bug 30230) action=expandtemplates should not silently override invalid title + inputs. +* (bug 18634) Create API to fetch MediaWiki's language fallback tree structure. +* (bug 26885) Allow show/hide of account blocks, temporary blocks and single IP + address blocks for list=blocks. === Languages updated in 1.19 === ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94692] trunk/extensions/Translate/groups/Shapado/Shapado.yaml
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94692 Revision: 94692 Author: siebrand Date: 2011-08-16 21:47:16 + (Tue, 16 Aug 2011) Log Message: --- Fix oops in r94676. Modified Paths: -- trunk/extensions/Translate/groups/Shapado/Shapado.yaml Modified: trunk/extensions/Translate/groups/Shapado/Shapado.yaml === --- trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 21:30:23 UTC (rev 94691) +++ trunk/extensions/Translate/groups/Shapado/Shapado.yaml 2011-08-16 21:47:16 UTC (rev 94692) @@ -252,7 +252,7 @@ targetPattern: shapado/config/locales/imports/%CODE%.yml MANGLER: - prefix: invitations- + prefix: imports- --- BASIC: ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94693] branches/extensions-realtime/IdentityApi/IdentityApi.class.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94693 Revision: 94693 Author: neilk Date: 2011-08-16 21:50:55 + (Tue, 16 Aug 2011) Log Message: --- missing breaks in switch cases Modified Paths: -- branches/extensions-realtime/IdentityApi/IdentityApi.class.php Modified: branches/extensions-realtime/IdentityApi/IdentityApi.class.php === --- branches/extensions-realtime/IdentityApi/IdentityApi.class.php 2011-08-16 21:47:16 UTC (rev 94692) +++ branches/extensions-realtime/IdentityApi/IdentityApi.class.php 2011-08-16 21:50:55 UTC (rev 94693) @@ -105,8 +105,10 @@ break; case 'wgServer': $ret['wgServer'] = $wgServer; + break; case 'wgArticlePath': $ret['wgArticlePath'] = $wgArticlePath; + break; default: break; } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94694] trunk/extensions/ExternalData/ED_ParserFunctions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94694
Revision: 94694
Author: yaron
Date: 2011-08-16 21:52:53 + (Tue, 16 Aug 2011)
Log Message:
---
Fix to r86476 - $edgValues should be getting set to array(), not null
Modified Paths:
--
trunk/extensions/ExternalData/ED_ParserFunctions.php
Modified: trunk/extensions/ExternalData/ED_ParserFunctions.php
===
--- trunk/extensions/ExternalData/ED_ParserFunctions.php2011-08-16
21:50:55 UTC (rev 94693)
+++ trunk/extensions/ExternalData/ED_ParserFunctions.php2011-08-16
21:52:53 UTC (rev 94694)
@@ -377,6 +377,6 @@
*/
static function doClearExternalData( $parser ) {
global $edgValues;
- $edgValues = null;
+ $edgValues = array();
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94695] trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94695
Revision: 94695
Author: jeroendedauw
Date: 2011-08-16 21:59:10 + (Tue, 16 Aug 2011)
Log Message:
---
fix strict warning
Modified Paths:
--
trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
Modified: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
===
--- trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 21:52:53 UTC (rev 94694)
+++ trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 21:59:10 UTC (rev 94695)
@@ -185,7 +185,7 @@
$icon_image_page = new ImagePage(
$title );
// Method was only added in MW 1.13
- $realFunction = array( 'ImagePage',
'getDisplayedFile' );
+ $realFunction = array(
$icon_image_page, 'getDisplayedFile' );
if ( is_callable( $realFunction ) ) {
$display_options['icon'] =
$icon_image_page-getDisplayedFile()-getURL();
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94696] trunk/extensions/SemanticResultFormats
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94696
Revision: 94696
Author: jeroendedauw
Date: 2011-08-16 22:06:21 + (Tue, 16 Aug 2011)
Log Message:
---
fix strict warnings
Modified Paths:
--
trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
trunk/extensions/SemanticResultFormats/RELEASE-NOTES
trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
Modified: trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
===
--- trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/Calendar/SRF_Calendar.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -159,7 +159,7 @@
// handle the 'color=' value, whether it came
// from a compound query or a regular one
// handling is different for SMW 1.5+
- $realFunction = array( 'SMWQueryResult',
'getResults' );
+ $realFunction = array( $field, 'getResults' );
if ( is_callable( $realFunction ) ) {
$res_subject =
$field-getResultSubject();
if ( isset(
$res_subject-display_options )
Modified: trunk/extensions/SemanticResultFormats/RELEASE-NOTES
===
--- trunk/extensions/SemanticResultFormats/RELEASE-NOTES2011-08-16
21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/RELEASE-NOTES2011-08-16
22:06:21 UTC (rev 94696)
@@ -6,6 +6,7 @@
* Fixed rendering bug in the tagcloud format occuring for inline queries.
* Fixed jqPlotBar and jqPlotPie rendering on Special:Ask and other special
pages.
+Cleaned up the jqPlotBar format somewhat.
== SRF 1.6 ==
Modified: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
===
--- trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotBar.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -103,7 +103,7 @@
$scripts = array();
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
Modified: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
===
--- trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-08-16 21:59:10 UTC (rev 94695)
+++ trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-08-16 22:06:21 UTC (rev 94696)
@@ -79,7 +79,7 @@
global $smwgJQueryIncluded, $srfgJQPlotIncluded;
if ( !$smwgJQueryIncluded ) {
- $realFunction = array( 'OutputPage', 'includeJQuery' );
+ $realFunction = array( $wgOut, 'includeJQuery' );
if ( is_callable( $realFunction ) ) {
$wgOut-includeJQuery();
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94697] trunk/extensions/Maps/Maps.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94697 Revision: 94697 Author: jeroendedauw Date: 2011-08-16 22:13:14 + (Tue, 16 Aug 2011) Log Message: --- 1.0.1 Modified Paths: -- trunk/extensions/Maps/Maps.php Modified: trunk/extensions/Maps/Maps.php === --- trunk/extensions/Maps/Maps.php 2011-08-16 22:06:21 UTC (rev 94696) +++ trunk/extensions/Maps/Maps.php 2011-08-16 22:13:14 UTC (rev 94697) @@ -41,7 +41,7 @@ die( 'bError:/b You need to have a href=http://www.mediawiki.org/wiki/Extension:Validator;Validator/a installed in order to use a href=http://www.mediawiki.org/wiki/Extension:Maps;Maps/a.br /' ); } -define( 'Maps_VERSION', '1.0.1 RC' ); +define( 'Maps_VERSION', '1.0.1' ); $wgExtensionCredits['parserhook'][] = array( 'path' = __FILE__, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94698] trunk/extensions/SemanticMaps/SemanticMaps.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94698 Revision: 94698 Author: jeroendedauw Date: 2011-08-16 22:13:26 + (Tue, 16 Aug 2011) Log Message: --- 1.0.1 Modified Paths: -- trunk/extensions/SemanticMaps/SemanticMaps.php Modified: trunk/extensions/SemanticMaps/SemanticMaps.php === --- trunk/extensions/SemanticMaps/SemanticMaps.php 2011-08-16 22:13:14 UTC (rev 94697) +++ trunk/extensions/SemanticMaps/SemanticMaps.php 2011-08-16 22:13:26 UTC (rev 94698) @@ -45,7 +45,7 @@ die( 'bError:/b This version of Semantic Maps requires Semantic MediaWiki 1.6 or above; use Semantic Maps 0.7.x for older versions.' ); } -define( 'SM_VERSION', '1.0.1 RC' ); +define( 'SM_VERSION', '1.0.1' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'other'][] = array( 'path' = __FILE__, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94699] tags/extensions/Maps/REL_1_0_1/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94699 Revision: 94699 Author: jeroendedauw Date: 2011-08-16 22:13:48 + (Tue, 16 Aug 2011) Log Message: --- Tag for version 1.0.1. Added Paths: --- tags/extensions/Maps/REL_1_0_1/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94700] tags/extensions/SemanticMaps/REL_1_0_1/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94700 Revision: 94700 Author: jeroendedauw Date: 2011-08-16 22:14:21 + (Tue, 16 Aug 2011) Log Message: --- Tag for version 1.0.1. Added Paths: --- tags/extensions/SemanticMaps/REL_1_0_1/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94701] trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94701
Revision: 94701
Author: yaron
Date: 2011-08-16 22:31:22 + (Tue, 16 Aug 2011)
Log Message:
---
Removed backwards compatibility for MW 1.13 - this extension already requires
MW 1.14+ anyway
Modified Paths:
--
trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
Modified: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
===
--- trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:14:21 UTC (rev 94700)
+++ trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:31:22 UTC (rev 94701)
@@ -183,12 +183,7 @@
if ( !is_null( $title )
$title-getNamespace() == NS_FILE $title-exists() ) {
$icon_image_page = new ImagePage(
$title );
-
- // Method was only added in MW 1.13
- $realFunction = array(
$icon_image_page, 'getDisplayedFile' );
- if ( is_callable( $realFunction ) ) {
- $display_options['icon'] =
$icon_image_page-getDisplayedFile()-getURL();
- }
+ $display_options['icon'] =
$icon_image_page-getDisplayedFile()-getURL();
}
} else {
$display_options[$key] = $value;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94702] trunk/phase3/resources/jquery/jquery.highlightText.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94702
Revision: 94702
Author: brion
Date: 2011-08-16 22:42:57 + (Tue, 16 Aug 2011)
Log Message:
---
Fix a regression in search highlighting from r90092
Followup on r94609, r94681 test cases.
This fixes the test case with a period that was failing; problem was not the
period, but the space before.
The changed regex in r90092 ended up including the preceding whitespace in the
match, so the position of the match was coming up one character before the
actual word -- thus offsetting the highlight by one char.
Changed from search to match, using the regex's index property (same as search
returns) and adding in the length of the first match component which covers the
space/whatever
Modified Paths:
--
trunk/phase3/resources/jquery/jquery.highlightText.js
Modified: trunk/phase3/resources/jquery/jquery.highlightText.js
===
--- trunk/phase3/resources/jquery/jquery.highlightText.js 2011-08-16
22:31:22 UTC (rev 94701)
+++ trunk/phase3/resources/jquery/jquery.highlightText.js 2011-08-16
22:42:57 UTC (rev 94702)
@@ -24,8 +24,9 @@
// non latin characters can make regex think a new word
has begun: do not use \b
//
http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js
// look for an occurence of our pattern and store the
starting position
- var pos = node.data.search( new RegExp( (^|\\s) +
$.escapeRE( pat ), i ) );
- if ( pos = 0 ) {
+ var match = node.data.match( new RegExp( (^|\\s) +
$.escapeRE( pat ), i ) );
+ if ( match ) {
+ var pos = match.index + match[1].length; //
include length of any matched spaces
// create the span wrapper for the matched text
var spannode = document.createElement( 'span' );
spannode.className = 'highlight';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94703] trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94703
Revision: 94703
Author: yaron
Date: 2011-08-16 22:45:48 + (Tue, 16 Aug 2011)
Log Message:
---
Removed support for SMW 1.5, and removed almost-entirely-unnecessary
wfLoadExtensionMessages() call
Modified Paths:
--
trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
Modified: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
===
--- trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:42:57 UTC (rev 94702)
+++ trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:45:48 UTC (rev 94703)
@@ -27,7 +27,6 @@
array_shift( $params ); // We already know the $parser.
$other_params = array();
- $query_result = null;
$results = array();
foreach ( $params as $param ) {
@@ -38,15 +37,7 @@
$sub_params = self::getSubParams(
$param );
$next_result =
self::getQueryResultFromFunctionParams( $sub_params, SMW_OUTPUT_WIKI );
- if ( method_exists( $next_result,
'getResults' ) ) { // SMW 1.5+
- $results =
self::mergeSMWQueryResults( $results, $next_result-getResults() );
- } else {
- if ( $query_result == null ) {
- $query_result = new
SCQQueryResult( $next_result-getPrintRequests(), new SMWQuery() );
- }
-
- $query_result-addResult(
$next_result );
- }
+ $results = self::mergeSMWQueryResults(
$results, $next_result-getResults() );
} else {
$parts = explode( '=', $param, 2 );
@@ -56,14 +47,9 @@
}
}
- // SMW 1.5+
- if ( is_null( $query_result ) ) {
- $query_result = new SCQQueryResult(
$next_result-getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
- }
-
+ $query_result = new SCQQueryResult(
$next_result-getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
$result = self::getResultFromQueryResult(
$query_result, $other_params, SMW_OUTPUT_WIKI );
} else {
- wfLoadExtensionMessages( 'SemanticMediaWiki' );
$result = smwfEncodeMessages( array( wfMsgForContent(
'smw_iq_disabled' ) ) );
}
@@ -189,12 +175,8 @@
$display_options[$key] = $value;
}
- if ( method_exists( $query_result, 'getResults' ) ) {
// SMW 1.5+
- foreach ( $query_result-getResults() as
$wiki_page ) {
- $wiki_page-display_options =
$display_options;
- }
- } else {
- $query_result-display_options =
$display_options;
+ foreach ( $query_result-getResults() as $wiki_page ) {
+ $wiki_page-display_options = $display_options;
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94704] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94704 Revision: 94704 Author: siebrand Date: 2011-08-16 23:03:29 + (Tue, 16 Aug 2011) Log Message: --- Update tags. Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2011-08-16 22:45:48 UTC (rev 94703) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2011-08-16 23:03:29 UTC (rev 94704) @@ -4,6 +4,7 @@ Ad SS Admin Dashboard +optional = admindashboard-control-help-url Admin Dashboard - Quick Stats file = AdminDashboard/QuickStats.i18n.php ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [94705] trunk/extensions/Translate/groups/Wikia/extensions.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94705 Revision: 94705 Author: siebrand Date: 2011-08-16 23:05:17 + (Tue, 16 Aug 2011) Log Message: --- Update tags. Modified Paths: -- trunk/extensions/Translate/groups/Wikia/extensions.txt Modified: trunk/extensions/Translate/groups/Wikia/extensions.txt === --- trunk/extensions/Translate/groups/Wikia/extensions.txt 2011-08-16 23:03:29 UTC (rev 94704) +++ trunk/extensions/Translate/groups/Wikia/extensions.txt 2011-08-16 23:05:17 UTC (rev 94705) @@ -8,6 +8,7 @@ Admin Dashboard - Quick Stats file = AdminDashboard/QuickStats.i18n.php +optional = quickstats-date-format Combo Ajax Login file = AjaxLogin/ComboAjaxLogin.i18n.php ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
