[MediaWiki-CVS] SVN: [65727] trunk/extensions/FlaggedRevs
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65727
Revision: 65727
Author: aaron
Date: 2010-05-01 08:31:11 + (Sat, 01 May 2010)
Log Message:
---
* JS display style fix
* Bumped style version
* Added TODO comment
Modified Paths:
--
trunk/extensions/FlaggedRevs/FlaggedRevs.php
trunk/extensions/FlaggedRevs/client/flaggedrevs.js
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php2010-05-01 04:23:59 UTC
(rev 65726)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php2010-05-01 08:31:11 UTC
(rev 65727)
@@ -301,7 +301,7 @@
$wgAvailableRights[] = 'stablesettings';
# Bump this number every time you change flaggedrevs.css/flaggedrevs.js
-$wgFlaggedRevStyleVersion = 69;
+$wgFlaggedRevStyleVersion = 70;
$wgExtensionFunctions[] = 'efLoadFlaggedRevs';
@@ -541,6 +541,7 @@
global $wgFlaggedRevsPatrolNamespaces,
$wgCanonicalNamespaceNames;
$wgFlaggedRevsPatrolNamespaces = array_keys(
$wgCanonicalNamespaceNames );
}
+ /* TODO: decouple from rc patrol */
# Check if FlaggedRevs is enabled by default for pages...
if ( $wgFlaggedRevsNamespaces !FlaggedRevs::stableOnlyIfConfigured()
) {
# Use RC Patrolling to check for vandalism.
Modified: trunk/extensions/FlaggedRevs/client/flaggedrevs.js
===
--- trunk/extensions/FlaggedRevs/client/flaggedrevs.js 2010-05-01 04:23:59 UTC
(rev 65726)
+++ trunk/extensions/FlaggedRevs/client/flaggedrevs.js 2010-05-01 08:31:11 UTC
(rev 65727)
@@ -48,7 +48,7 @@
var toggle = document.getElementById('mw-fr-revisiontoggle');
if( !toggle ) return;
if( ratings.style.display == 'none' ) {
- ratings.style.display = 'inline';
+ ratings.style.display = 'block';
toggle.innerHTML = this.messages.toggleHide;
} else {
ratings.style.display = 'none';
@@ -63,7 +63,7 @@
var toggle = document.getElementById('mw-fr-difftoggle');
if( !toggle ) return;
if( diff.style.display == 'none' ) {
- diff.style.display = 'inline';
+ diff.style.display = 'block';
toggle.innerHTML = this.messages.diffToggleHide;
} else {
diff.style.display = 'none';
@@ -78,7 +78,7 @@
var toggle = document.getElementById('mw-fr-logtoggle');
if( !toggle ) return;
if( log.style.display == 'none' ) {
- log.style.display = 'inline';
+ log.style.display = 'block';
toggle.innerHTML = this.messages.logToggleHide;
} else {
log.style.display = 'none';
@@ -93,7 +93,7 @@
var toggle = document.getElementById('mw-fr-logtoggle');
if( !toggle ) return;
if( log.style.display == 'none' ) {
- log.style.display = 'inline';
+ log.style.display = 'block';
toggle.innerHTML = this.messages.logDetailsHide;
} else {
log.style.display = 'none';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65728] branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65728
Revision: 65728
Author: aaron
Date: 2010-05-01 08:41:44 + (Sat, 01 May 2010)
Log Message:
---
MFT r65668-r65727
Modified Paths:
--
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/FlaggedRevs.php
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.css
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.js
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/language/FlaggedRevs.i18n.php
Property Changed:
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/
Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha
___
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha:51646
/trunk/extensions/FlaggedRevs:63266-63443,63460-63926,63929,63938,63940-64497,64515-64768,64916-65417,65459-65601
/trunk/extensions/FlaggedRevs_alpha:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
+ /branches/REL1_15/phase3/extensions/FlaggedRevs_alpha:51646
/trunk/extensions/FlaggedRevs:63266-63443,63460-63926,63929,63938,63940-64497,64515-64768,64916-65417,65459-65601,65668-65727
/trunk/extensions/FlaggedRevs_alpha:56207,56209,56296,56333,56355
/trunk/phase3/extensions/FlaggedRevs_alpha:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816
Modified: branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/FlaggedRevs.php
===
--- branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/FlaggedRevs.php
2010-05-01 08:31:11 UTC (rev 65727)
+++ branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/FlaggedRevs.php
2010-05-01 08:41:44 UTC (rev 65728)
@@ -301,7 +301,7 @@
$wgAvailableRights[] = 'stablesettings';
# Bump this number every time you change flaggedrevs.css/flaggedrevs.js
-$wgFlaggedRevStyleVersion = 69;
+$wgFlaggedRevStyleVersion = 70;
$wgExtensionFunctions[] = 'efLoadFlaggedRevs';
@@ -541,6 +541,7 @@
global $wgFlaggedRevsPatrolNamespaces,
$wgCanonicalNamespaceNames;
$wgFlaggedRevsPatrolNamespaces = array_keys(
$wgCanonicalNamespaceNames );
}
+ /* TODO: decouple from rc patrol */
# Check if FlaggedRevs is enabled by default for pages...
if ( $wgFlaggedRevsNamespaces !FlaggedRevs::stableOnlyIfConfigured()
) {
# Use RC Patrolling to check for vandalism.
Modified:
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.css
===
--- branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.css
2010-05-01 08:31:11 UTC (rev 65727)
+++ branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.css
2010-05-01 08:41:44 UTC (rev 65728)
@@ -119,7 +119,7 @@
div.flaggedrevs_short_details {
border: 1px solid #aaa;
background-color: #f9f9f9;
- padding: 2px;
+ padding: 4px;
position: absolute;
top: 0;
right: 0;
Modified:
branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.js
===
--- branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.js
2010-05-01 08:31:11 UTC (rev 65727)
+++ branches/wmf/1.16wmf4/extensions/FlaggedRevs_alpha/client/flaggedrevs.js
2010-05-01 08:41:44 UTC (rev 65728)
@@ -48,7 +48,7 @@
var toggle = document.getElementById('mw-fr-revisiontoggle');
if( !toggle ) return;
if( ratings.style.display == 'none' ) {
- ratings.style.display = 'inline';
+ ratings.style.display = 'block';
toggle.innerHTML = this.messages.toggleHide;
} else {
ratings.style.display = 'none';
@@ -63,7 +63,7 @@
var toggle = document.getElementById('mw-fr-difftoggle');
if( !toggle ) return;
if( diff.style.display == 'none' ) {
- diff.style.display = 'inline';
+ diff.style.display = 'block';
toggle.innerHTML = this.messages.diffToggleHide;
} else {
diff.style.display = 'none';
@@ -78,7 +78,7 @@
var toggle = document.getElementById('mw-fr-logtoggle');
if( !toggle ) return;
if( log.style.display == 'none' ) {
- log.style.display = 'inline';
+ log.style.display = 'block';
toggle.innerHTML = this.messages.logToggleHide;
} else {
[MediaWiki-CVS] SVN: [65729] trunk/phase3/includes/Article.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65729 Revision: 65729 Author: churchofemacs Date: 2010-05-01 10:56:52 + (Sat, 01 May 2010) Log Message: --- fixing documentation (it seems the function name has changed) Modified Paths: -- trunk/phase3/includes/Article.php Modified: trunk/phase3/includes/Article.php === --- trunk/phase3/includes/Article.php 2010-05-01 08:41:44 UTC (rev 65728) +++ trunk/phase3/includes/Article.php 2010-05-01 10:56:52 UTC (rev 65729) @@ -1604,7 +1604,7 @@ /** * Insert a new empty page record for this article. * This *must* be followed up by creating a revision -* and running $this-updateToLatest( $rev_id ); +* and running $this-updateRevisionOn( ... ); * or else the record will be left in a funky state. * Best if all done inside a transaction. * ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65730] trunk/extensions/Translate/PageTranslation.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65730 Revision: 65730 Author: siebrand Date: 2010-05-01 14:06:50 + (Sat, 01 May 2010) Log Message: --- Add special page name title messages Modified Paths: -- trunk/extensions/Translate/PageTranslation.i18n.php Modified: trunk/extensions/Translate/PageTranslation.i18n.php === --- trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-01 10:56:52 UTC (rev 65729) +++ trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-01 14:06:50 UTC (rev 65730) @@ -12,6 +12,8 @@ */ $messages['en'] = array( 'pagetranslation' = 'Page translation', + 'firststeps' = 'First steps', + 'supportedlanguages' = 'Supported languages', 'right-pagetranslation' = 'Mark versions of pages for translation', 'tpt-desc' = 'Extension for translating content pages', 'tpt-section' = 'Translation unit $1', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65731] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65731
Revision: 65731
Author: siebrand
Date: 2010-05-01 14:29:28 + (Sat, 01 May 2010)
Log Message:
---
Update and add UI messages
Modified Paths:
--
trunk/extensions/Translate/FirstSteps.i18n.php
trunk/extensions/Translate/PageTranslation.i18n.php
trunk/extensions/Translate/Translate.i18n.php
Modified: trunk/extensions/Translate/FirstSteps.i18n.php
===
--- trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 14:06:50 UTC
(rev 65730)
+++ trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 14:29:28 UTC
(rev 65731)
@@ -12,6 +12,7 @@
* @author Siebrand
*/
$messages['en'] = array(
+ 'firststeps' = 'First steps',
'translate-fs-pagetitle-done' = ' - done!',
'translate-fs-pagetitle' = 'Steps to translator - $1',
'translate-fs-signup-title' = 'Sign up',
@@ -20,7 +21,7 @@
'translate-fs-permissions-title' = 'Request permissions',
'translate-fs-target-title' = 'Start translating!',
'translate-fs-email-title' = 'Confirm your e-mail address',
-
+
'translate-fs-intro' = Welcome to the {{SITENAME}} first steps wizard.
You will be guided trough the process of becoming a translator step by step.
In the end you will be able to translate ''interface messages'' of all
supported projects at {{SITENAME}}.,
@@ -85,24 +86,22 @@
'translate-fs-target-text' = 'Congratulations!
You can now start translating.
-Don\'t be afraid if still feels confusing.
-At [[Project list]] there is an overview of what you can translate.
-Most of the projects have a short description page with \'\'Translate this
project\'\' link,
-that will take you to a page which lists all untranslated messages.
-The list of all projects is at [[Special:Translate]].
+Do not be afraid if still feels new and confusing to you.
+At [[Project list]] there is an overview of projects you can contribute
translations to.
+Most of the projects have a short description page with a \'\'Translate this
project\'\' link, that will take you to a page which lists all untranslated
messages.
+A list of all message groups with the [[[Special:LanguageStats|current
translation status for a language]] is also available.
-If you feel that you need to understand more before you start translating,
-you can read [[FAQ|Frequently asked questions]].
-Unfortanely we do not currently have good documentation.
-If there is something that you can\'t find answer for,
-don\'t hesitate to ask it at [[Support]].
+If you feel that you need to understand more before you start translating, you
can read the [[FAQ|Frequently asked questions]].
+Unfortanely documentation can be out of date sometimes.
+If there is something that you think you should be able to do, but cannot find
out how, do not hesitate to ask it at the [[Support|support page]].
-You can also try to seek help of fellow translators that speak the same
language at [[Portal:$1]]
-(change the language code if it is incorrect).',
+You can also contact fellow translators of the same language at
[[Portal:$1|your language portal]].
+The portal links to your current [[Special:Preferences|language preference]].
+Please change it if needed.',
- 'translate-fs-email-text' = 'You should add e-mail to your preferences
and confirm it.
+ 'translate-fs-email-text' = 'Please provide your e-mail address in
[[Special:Preferences|your preferences]] and confirm it from the e-mail that is
sent to you.
-This helps us to contact you.
-You also receive newsletters at most once a month.
-If you don\'t want receive them, you can opt-out from your
[[Special:Preferences]].',
-);
\ No newline at end of file
+This allows other users to contact you by e-mail.
+You will also receive newsletters at most once a month.
+If you do not want receive newsletters, you can opt-out in the tab
{{int:prefs-misc}} of your [[Special:Preferences|preferences]].',
+);
Modified: trunk/extensions/Translate/PageTranslation.i18n.php
===
--- trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-01 14:06:50 UTC
(rev 65730)
+++ trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-01 14:29:28 UTC
(rev 65731)
@@ -12,8 +12,6 @@
*/
$messages['en'] = array(
'pagetranslation' = 'Page translation',
- 'firststeps' = 'First steps',
- 'supportedlanguages' = 'Supported languages',
'right-pagetranslation' = 'Mark versions of pages for translation',
'tpt-desc' = 'Extension for translating content pages',
'tpt-section' = 'Translation unit $1',
Modified: trunk/extensions/Translate/Translate.i18n.php
===
--- trunk/extensions/Translate/Translate.i18n.php 2010-05-01 14:06:50 UTC
(rev 65730)
+++
[MediaWiki-CVS] SVN: [65732] trunk/extensions/Translate/SpecialFirstSteps.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65732
Revision: 65732
Author: siebrand
Date: 2010-05-01 14:41:11 + (Sat, 01 May 2010)
Log Message:
---
Make unlisted special page
Modified Paths:
--
trunk/extensions/Translate/SpecialFirstSteps.php
Modified: trunk/extensions/Translate/SpecialFirstSteps.php
===
--- trunk/extensions/Translate/SpecialFirstSteps.php2010-05-01 14:29:28 UTC
(rev 65731)
+++ trunk/extensions/Translate/SpecialFirstSteps.php2010-05-01 14:41:11 UTC
(rev 65732)
@@ -17,7 +17,7 @@
$wgSpecialPages['FirstSteps'] = 'SpecialFirstSteps';
$wgExtensionMessagesFiles['FirstSteps'] = dirname( __FILE__ ) .
'/FirstSteps.i18n.php';
-class SpecialFirstSteps extends SpecialPage {
+class SpecialFirstSteps extends UnlistedSpecialPage {
protected $skin, $user, $out;
public function __construct() {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65733] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65733
Revision: 65733
Author: siebrand
Date: 2010-05-01 14:41:36 + (Sat, 01 May 2010)
Log Message:
---
Update messages and whitespace
Modified Paths:
--
trunk/extensions/Translate/FirstSteps.i18n.php
trunk/extensions/Translate/SpecialSupportedLanguages.php
Modified: trunk/extensions/Translate/FirstSteps.i18n.php
===
--- trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 14:41:11 UTC
(rev 65732)
+++ trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 14:41:36 UTC
(rev 65733)
@@ -14,11 +14,11 @@
$messages['en'] = array(
'firststeps' = 'First steps',
'translate-fs-pagetitle-done' = ' - done!',
- 'translate-fs-pagetitle' = 'Steps to translator - $1',
+ 'translate-fs-pagetitle' = 'Start translating - $1',
'translate-fs-signup-title' = 'Sign up',
'translate-fs-settings-title' = 'Configure your preferences',
- 'translate-fs-userpage-title' = 'Create user page for yourself',
- 'translate-fs-permissions-title' = 'Request permissions',
+ 'translate-fs-userpage-title' = 'Create your user page',
+ 'translate-fs-permissions-title' = 'Request translator permissions',
'translate-fs-target-title' = 'Start translating!',
'translate-fs-email-title' = 'Confirm your e-mail address',
@@ -44,41 +44,40 @@
It is easy to forget to change the langauge to the correct one, so setting it
now is higly recommended.
While you are there, you can also request the software to display translations
in other languages you know.
-This setting can be found under {{int:prefs-editing}} tab.
-Feel free to explore other settings too.
+This setting can be found under tab {{int:prefs-editing}}.
+Feel free to explore other settings, too.
Go to your [[Special:Preferences|preferences page]] now and then return back
to this page.',
'translate-fs-settings-skip' = I'm done. Let me proceed.,
'translate-fs-userpage-text' = 'Now you need to create an user page.
-Please tell something about yourself, who you are and what you do.
-This will help {{SITENAME}} community to work together.
-In {{SITENAME}} there are people all around the world doing different things.
+Please write something about yourself; who you are and what you do.
+This will help the {{SITENAME}} community to work together.
+At {{SITENAME}} there are people from all around the world working on
different languages and projects.
-In the prefilled box above in the very first line there is
nowiki{{#babel:en-2}}/nowiki.
-You should fill it accordingly to your language knowledge.
+In the prefilled box above in the very first line you see
nowiki{{#babel:en-2}}/nowiki.
+Please complete it with your language knowledge.
The number behind the language code describes how well you know the language.
The alternatives are:
-* 0 not at all
-* 1 little
-* 2 basic
-* 3 good
-* 4 like a native speaker
-* 5 you use the language professionally, for example you are a professional
translator.
+* 1 - a little
+* 2 - basic knowledge
+* 3 - good knowledge
+* 4 - native speaker level
+* 5 - you use the language professionally, for example you are a professional
translator.
-If you are a native speaker of a language, leave the number away.
-Example: if you speak Tamil natively, good English and little Swahili, you
would write:
+If you are a native speaker of a language, leave the skill level out, and only
use the language code.
+Example: if you speak Tamil natively, English well, and little Swahili, you
would write:
ttnowiki{{#babel:ta|en-3|sw-1}}/nowiki/tt
-If you do not know the language code of a language, now is good time to check
it up. You can use the list below.',
+If you do not know the language code of a language, now is good time to look
it up. You can use the list below.',
'translate-fs-userpage-submit' = 'Create my userpage',
- 'translate-fs-userpage-done' = 'Well done! You now have an userpage.',
+ 'translate-fs-userpage-done' = 'Well done! You now have an user page.',
'translate-fs-permissions-text' = 'Now you need to place a request to
be added to the translator group.
Until we fix the code, please go to [[Project:Translator]] and follow the
instructions.
Then come back to this page.
-After you have filed your request, one of the volunteer staff member will
check your request and approve it as soon as possible.
+After you have filed your request, one of the volunteer staff members will
check your request and approve it as soon as possible.
Please be patient.
delCheck that the following request is correctly filled and then press the
request button./del',
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php
[MediaWiki-CVS] SVN: [65734] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65734
Revision: 65734
Author: siebrand
Date: 2010-05-01 14:49:45 + (Sat, 01 May 2010)
Log Message:
---
* add special pages FirstSteps and SupportedLanguages in default settings
* make FirstSteps unlisted
Modified Paths:
--
trunk/extensions/Translate/SpecialFirstSteps.php
trunk/extensions/Translate/SpecialSupportedLanguages.php
trunk/extensions/Translate/Translate.php
Modified: trunk/extensions/Translate/SpecialFirstSteps.php
===
--- trunk/extensions/Translate/SpecialFirstSteps.php2010-05-01 14:41:36 UTC
(rev 65733)
+++ trunk/extensions/Translate/SpecialFirstSteps.php2010-05-01 14:49:45 UTC
(rev 65734)
@@ -1,22 +1,10 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die();
-
/**
* @author Niklas Laxström
* @copyright Copyright © 2010 Niklas Laxström
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
-$wgExtensionCredits['specialpage'][] = array(
- 'path' = __FILE__,
- 'name' = 'Translate: The First STeps',
- 'version'= '2010-02-06',
- 'author' = 'Niklas Laxström',
-);
-
-$wgSpecialPages['FirstSteps'] = 'SpecialFirstSteps';
-$wgExtensionMessagesFiles['FirstSteps'] = dirname( __FILE__ ) .
'/FirstSteps.i18n.php';
-
class SpecialFirstSteps extends UnlistedSpecialPage {
protected $skin, $user, $out;
@@ -236,6 +224,4 @@
return $step_message;
}
-
}
-
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
14:41:36 UTC (rev 65733)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
14:49:45 UTC (rev 65734)
@@ -1,23 +1,11 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die();
-
/**
* @author Niklas Laxström
* @copyright Copyright © 2010 Niklas Laxström
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
-$wgExtensionCredits['specialpage'][] = array(
- 'path' = __FILE__,
- 'name' = 'Translate: Supported Languages',
- 'version'= '2010-01-27',
- 'author' = 'Niklas Laxström',
- 'description'= '[[Special:Supported Languages|Special page]] for
listing supported languages efficiently',
-);
-
-$wgSpecialPages['SupportedLanguages'] = 'SpecialSupportedLanguages';
-
-class SpecialSupportedLanguages extends SpecialPage {
+class SpecialSupportedLanguages extends UnlistedSpecialPage {
public function __construct() {
parent::__construct( 'SupportedLanguages' );
}
Modified: trunk/extensions/Translate/Translate.php
===
--- trunk/extensions/Translate/Translate.php2010-05-01 14:41:36 UTC (rev
65733)
+++ trunk/extensions/Translate/Translate.php2010-05-01 14:49:45 UTC (rev
65734)
@@ -12,7 +12,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
-define( 'TRANSLATE_VERSION', '2010-04-25' );
+define( 'TRANSLATE_VERSION', '2010-05-01' );
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
@@ -28,6 +28,7 @@
require_once( $dir . '_autoload.php' );
$wgExtensionMessagesFiles['Translate'] = $dir . 'Translate.i18n.php';
+$wgExtensionMessagesFiles['FirstSteps'] = $dir . 'FirstSteps.i18n.php';
$wgExtensionMessagesFiles['PageTranslation'] = $dir .
'PageTranslation.i18n.php';
$wgExtensionAliasesFiles['Translate'] = $dir . 'Translate.alias.php';
$wgExtensionFunctions[] = 'efTranslateInit';
@@ -39,6 +40,8 @@
$wgSpecialPages['TranslationStats'] = 'SpecialTranslationStats';
$wgSpecialPages['LanguageStats'] = 'SpecialLanguageStats';
$wgSpecialPages['ImportTranslations'] = 'SpecialImportTranslations';
+$wgSpecialPages['FirstSteps'] = 'SpecialFirstSteps';
+$wgSpecialPages['SupportedLanguages'] = 'SpecialSupportedLanguages';
$wgSpecialPageGroups['Magic'] = 'wiki';
$wgSpecialPageGroups['Translate'] = 'wiki';
$wgSpecialPageGroups['Translations'] = 'pages';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65735] trunk/extensions/Translate/_autoload.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65735 Revision: 65735 Author: siebrand Date: 2010-05-01 14:52:35 + (Sat, 01 May 2010) Log Message: --- Follow-up r65734: load special page classes Modified Paths: -- trunk/extensions/Translate/_autoload.php Modified: trunk/extensions/Translate/_autoload.php === --- trunk/extensions/Translate/_autoload.php2010-05-01 14:49:45 UTC (rev 65734) +++ trunk/extensions/Translate/_autoload.php2010-05-01 14:52:35 UTC (rev 65735) @@ -47,6 +47,8 @@ $wgAutoloadClasses['SpecialTranslations'] = $dir . 'SpecialTranslations.php'; $wgAutoloadClasses['SpecialLanguageStats'] = $dir . 'SpecialLanguageStats.php'; $wgAutoloadClasses['SpecialImportTranslations'] = $dir . 'SpecialImportTranslations.php'; +$wgAutoloadClasses['SpecialFirstSteps'] = $dir . 'SpecialFirstSteps.php'; +$wgAutoloadClasses['SpecialSupportedLanguages'] = $dir . 'SpecialSupportedLanguages.php'; $wgAutoloadClasses['SimpleFormatReader'] = $dir . 'ffs/Simple.php'; $wgAutoloadClasses['SimpleFormatWriter'] = $dir . 'ffs/Simple.php'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65736] trunk/extensions/Translate/Translate.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65736 Revision: 65736 Author: siebrand Date: 2010-05-01 14:53:45 + (Sat, 01 May 2010) Log Message: --- wgSpecialPageGroups wiki for ImportTranslations Modified Paths: -- trunk/extensions/Translate/Translate.php Modified: trunk/extensions/Translate/Translate.php === --- trunk/extensions/Translate/Translate.php2010-05-01 14:52:35 UTC (rev 65735) +++ trunk/extensions/Translate/Translate.php2010-05-01 14:53:45 UTC (rev 65736) @@ -48,6 +48,7 @@ $wgSpecialPageGroups['TranslationChanges'] = 'changes'; $wgSpecialPageGroups['TranslationStats'] = 'wiki'; $wgSpecialPageGroups['LanguageStats'] = 'wiki'; +$wgSpecialPageGroups['ImportTranslations'] = 'wiki'; $wgSpecialPageGroups['PageTranslation'] = 'pagetools'; $wgHooks['EditPage::showEditForm:initial'][] = 'TranslateEditAddons::addTools'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65737] trunk/extensions/APC
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65737
Revision: 65737
Author: siebrand
Date: 2010-05-01 14:56:19 + (Sat, 01 May 2010)
Log Message:
---
Follow-up r65078: change default for special page name
Modified Paths:
--
trunk/extensions/APC/APC.alias.php
trunk/extensions/APC/SpecialAPC.php
Modified: trunk/extensions/APC/APC.alias.php
===
--- trunk/extensions/APC/APC.alias.php 2010-05-01 14:53:45 UTC (rev 65736)
+++ trunk/extensions/APC/APC.alias.php 2010-05-01 14:56:19 UTC (rev 65737)
@@ -10,7 +10,7 @@
/** English */
$aliases['en'] = array(
- 'ViewAPC' = array( 'ViewAPC' ),
+ 'ViewAPC' = array( 'APC', 'ViewAPC' ),
);
/** Arabic (العربية) */
Modified: trunk/extensions/APC/SpecialAPC.php
===
--- trunk/extensions/APC/SpecialAPC.php 2010-05-01 14:53:45 UTC (rev 65736)
+++ trunk/extensions/APC/SpecialAPC.php 2010-05-01 14:56:19 UTC (rev 65737)
@@ -7,7 +7,7 @@
protected $opts, $title;
function __construct() {
- SpecialPage::SpecialPage( 'ViewAPC' );
+ SpecialPage::SpecialPage( 'APC' );
$this-title = $this-getTitle();
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65738] trunk/extensions/APC/APC.alias.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65738 Revision: 65738 Author: siebrand Date: 2010-05-01 14:57:43 + (Sat, 01 May 2010) Log Message: --- Follow-up r65737: update alias keys Modified Paths: -- trunk/extensions/APC/APC.alias.php Modified: trunk/extensions/APC/APC.alias.php === --- trunk/extensions/APC/APC.alias.php 2010-05-01 14:56:19 UTC (rev 65737) +++ trunk/extensions/APC/APC.alias.php 2010-05-01 14:57:43 UTC (rev 65738) @@ -10,191 +10,191 @@ /** English */ $aliases['en'] = array( - 'ViewAPC' = array( 'APC', 'ViewAPC' ), + 'APC' = array( 'APC', 'APC' ), ); /** Arabic (العربية) */ $aliases['ar'] = array( - 'ViewAPC' = array( 'عرض_إيه_بي_سي' ), + 'APC' = array( 'عرض_إيه_بي_سي' ), ); /** Egyptian Spoken Arabic (مصرى) */ $aliases['arz'] = array( - 'ViewAPC' = array( 'عرض_إيه_بى_سى' ), + 'APC' = array( 'عرض_إيه_بى_سى' ), ); /** Bulgarian (Български) */ $aliases['bg'] = array( - 'ViewAPC' = array( 'Информация за APC' ), + 'APC' = array( 'Информация за APC' ), ); /** Bosnian (Bosanski) */ $aliases['bs'] = array( - 'ViewAPC' = array( 'PregledAPC' ), + 'APC' = array( 'PregledAPC' ), ); /** German (Deutsch) */ $aliases['de'] = array( - 'ViewAPC' = array( 'APC-Informationen' ), + 'APC' = array( 'APC-Informationen' ), ); /** Lower Sorbian (Dolnoserbski) */ $aliases['dsb'] = array( - 'ViewAPC' = array( 'APC' ), + 'APC' = array( 'APC' ), ); /** Finnish (Suomi) */ $aliases['fi'] = array( - 'ViewAPC' = array( 'APC-tiedot' ), + 'APC' = array( 'APC-tiedot' ), ); /** French (Français) */ $aliases['fr'] = array( - 'ViewAPC' = array( 'Voir APC', 'VoirAPC' ), + 'APC' = array( 'Voir APC', 'VoirAPC' ), ); /** Franco-Provençal (Arpetan) */ $aliases['frp'] = array( - 'ViewAPC' = array( 'Vêre APC', 'VêreAPC' ), + 'APC' = array( 'Vêre APC', 'VêreAPC' ), ); /** Galician (Galego) */ $aliases['gl'] = array( - 'ViewAPC' = array( 'Ver APC' ), + 'APC' = array( 'Ver APC' ), ); /** Swiss German (Alemannisch) */ $aliases['gsw'] = array( - 'ViewAPC' = array( 'APC-Informatione' ), + 'APC' = array( 'APC-Informatione' ), ); /** Upper Sorbian (Hornjoserbsce) */ $aliases['hsb'] = array( - 'ViewAPC' = array( 'APC' ), + 'APC' = array( 'APC' ), ); /** Hungarian (Magyar) */ $aliases['hu'] = array( - 'ViewAPC' = array( 'APC megtekintése' ), + 'APC' = array( 'APC megtekintése' ), ); /** Interlingua (Interlingua) */ $aliases['ia'] = array( - 'ViewAPC' = array( 'Info APC' ), + 'APC' = array( 'Info APC' ), ); /** Indonesian (Bahasa Indonesia) */ $aliases['id'] = array( - 'ViewAPC' = array( 'Lihat APC', 'LihatAPC' ), + 'APC' = array( 'Lihat APC', 'LihatAPC' ), ); /** Japanese (日本語) */ $aliases['ja'] = array( - 'ViewAPC' = array( 'APC情報', 'APC表示', 'ＡＰＣ情報', 'ＡＰＣ表示' ), + 'APC' = array( 'APC情報', 'APC表示', 'ＡＰＣ情報', 'ＡＰＣ表示' ), ); /** Khmer (ភាសាខ្មែរ) */ $aliases['km'] = array( - 'ViewAPC' = array( 'មើលAPC' ), + 'APC' = array( 'មើលAPC' ), ); /** Korean (한국어) */ $aliases['ko'] = array( - 'ViewAPC' = array( 'APC보기' ), + 'APC' = array( 'APC보기' ), ); /** Colognian (Ripoarisch) */ $aliases['ksh'] = array( - 'ViewAPC' = array( 'APC-Enfommazjuhne' ), + 'APC' = array( 'APC-Enfommazjuhne' ), ); /** Luxembourgish (Lëtzebuergesch) */ $aliases['lb'] = array( - 'ViewAPC' = array( 'APC weisen' ), + 'APC' = array( 'APC weisen' ), ); /** Marathi (मराठी) */ $aliases['mr'] = array( - 'ViewAPC' = array( 'APCपहा' ), + 'APC' = array( 'APCपहा' ), ); /** Nedersaksisch (Nedersaksisch) */ $aliases['nds-nl'] = array( - 'ViewAPC' = array( 'APC_bekieken' ), + 'APC' = array( 'APC_bekieken' ), ); /** Dutch (Nederlands) */ $aliases['nl'] = array( - 'ViewAPC' = array( 'APCBekijken' ), + 'APC' = array( 'APCBekijken' ), ); /** Norwegian Nynorsk (Norsk (nynorsk)) */ $aliases['nn'] = array( - 'ViewAPC' = array( 'Sjå APC' ), + 'APC' = array( 'Sjå APC' ), ); /** Norwegian (bokmål) (Norsk (bokmål)) */ $aliases['no'] = array( - 'ViewAPC' = array( 'Vis APC' ), + 'APC' = array( 'Vis APC' ), ); /** Occitan (Occitan) */ $aliases['oc'] = array( - 'ViewAPC' = array( 'Veire APC', 'VeireAPC' ), + 'APC' = array( 'Veire APC', 'VeireAPC' ), ); /** Polish (Polski) */ $aliases['pl'] = array( - 'ViewAPC' = array( 'Podgląd APC' ), + 'APC' = array( 'Podgląd APC' ), ); /** Portuguese (Português) */ $aliases['pt'] = array( - 'ViewAPC' = array( 'Ver APC' ), + 'APC' = array( 'Ver APC' ), ); /** Romanian (Română) */ $aliases['ro'] = array( - 'ViewAPC' = array( 'Vizualizare APC' ), + 'APC' = array(
[MediaWiki-CVS] SVN: [65739] trunk/extensions/APC/APC.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65739 Revision: 65739 Author: siebrand Date: 2010-05-01 14:58:30 + (Sat, 01 May 2010) Log Message: --- Follow-up r65737: update special page name message keys Modified Paths: -- trunk/extensions/APC/APC.i18n.php Modified: trunk/extensions/APC/APC.i18n.php === --- trunk/extensions/APC/APC.i18n.php 2010-05-01 14:57:43 UTC (rev 65738) +++ trunk/extensions/APC/APC.i18n.php 2010-05-01 14:58:30 UTC (rev 65739) @@ -3,7 +3,7 @@ $messages = array(); $messages['en'] = array( - 'viewapc' = 'APC information', + 'apc' = 'APC information', 'apc-desc' = '[[Special:ViewAPC|View and manage APC cache]] with MediaWiki', 'right-apc'= 'Use all features in [[Special:ViewAPC|ViewAPC]]', @@ -203,7 +203,7 @@ * @author Naudefj */ $messages['af'] = array( - 'viewapc' = 'APC-inligting', + 'apc' = 'APC-inligting', 'apc-desc' = 'Die [[Special:ViewAPC|APC-kas monitor en bestuur]] vanuit MediaWiki', 'right-apc' = 'Gebruik al die funksies van [[Special:ViewAPC|ViewAPC]]', 'viewapc-apc-not-available' = 'Daar is geen inligting aangaande die kas beskikbaar nie. @@ -336,7 +336,7 @@ * @author ترجمان05 */ $messages['ar'] = array( - 'viewapc' = 'معلومات إيه بي سي', + 'apc' = 'معلومات إيه بي سي', 'apc-desc' = '[[Special:ViewAPC|عرض والتحكم بكاش الإيه بي سي]] مع ميدياويكي', 'right-apc' = 'استخدام كل الخواص في [[Special:ViewAPC|ViewAPC]]', 'viewapc-apc-not-available' = 'لا معلومات اختزان متوفرة. @@ -446,7 +446,7 @@ * @author Ramsis II */ $messages['arz'] = array( - 'viewapc' = 'معلومات إيه بى سي', + 'apc' = 'معلومات إيه بى سي', 'apc-desc' = '[[Special:ViewAPC|عرض والتحكم بكاش الإيه بى سي]] مع ميدياويكي', 'right-apc' = 'استخدام كل الخواص فى [[Special:ViewAPC|ViewAPC]]', 'viewapc-apc-not-available' = 'لا معلومات اختزان متوفرة. @@ -556,7 +556,7 @@ * @author Jim-by */ $messages['be-tarask'] = array( - 'viewapc' = 'Інфармацыя пра APC', + 'apc' = 'Інфармацыя пра APC', 'apc-desc' = '[[Special:ViewAPC|Прагляд і кіраваньне кэшам APC]] у MediaWiki', 'right-apc' = 'выкарыстаньне ўсіх магчымасьцяў [[Special:ViewAPC|ViewAPC]]', 'viewapc-apc-not-available' = 'Няма інфармацыі пра кэш. @@ -665,7 +665,7 @@ * @author DCLXVI */ $messages['bg'] = array( - 'viewapc' = 'Информация за APC', + 'apc' = 'Информация за APC', 'right-apc' = 'Използване на всички възможности на Special:ViewAPC', 'viewapc-clear-confirm' = 'Необходимо е потвърждение за изчистване на кеша.', 'viewapc-clear-user-cache' = 'Изчистване на потребителския кеш', @@ -720,7 +720,7 @@ * @author Y-M D */ $messages['br'] = array( - 'viewapc' = 'Titouroù APC', + 'apc' = 'Titouroù APC', 'apc-desc' = '[[Special:ViewAPC|Gwelet ha merañ ar grubuilh APC]] gant MediaWiki', 'right-apc' = Implijout holl arc'hweladurioù [[Special:ViewAPC|ViewAPC]], 'viewapc-apc-not-available' = Ne c'haller kaout titour ebet war ar grubuilh. @@ -829,7 +829,7 @@ * @author CERminator */ $messages['bs'] = array( - 'viewapc' = 'APC informacije', + 'apc' = 'APC informacije', 'apc-desc' = '[[Special:ViewAPC|Pregledaj i uredi APC keš]] sa MediaWiki', 'right-apc' = 'Korištenje svih mogućnosti u [[Special:ViewAPC|ViewAPC]]', 'viewapc-apc-not-available' = 'Podaci o kešu nisu dostupni. @@ -971,7 +971,7 @@ * @author Mormegil */ $messages['cs'] = array( - 'viewapc' = 'Informace o APC', + 'apc' = 'Informace o APC', 'apc-desc' = '[[Special:ViewAPC|Zobrazit a spravovat vyrovnávací paměť APC]] pomocí MediaWiki', 'right-apc' = 'Použít všechny funkce na [[Special:ViewAPC|ViewAPC]].', 'viewapc-apc-not-available' = 'Nejsou dostupné žádné informace o vyrovnávací paměti. @@ -1086,7 +1086,7 @@ * @author Umherirrender */ $messages['de'] = array( - 'viewapc' = 'APC-Informationen', + 'apc' = 'APC-Informationen', 'apc-desc' = 'APC-Cache mit MediaWiki [[Special:ViewAPC|einsehen und bearbeiten]]', 'right-apc' = 'Alle Funktionen von [[Special:ViewAPC|ViewAPC]] verwenden', 'viewapc-apc-not-available' = 'Keine Cache-Informationen verfügbar. @@ -1212,7 +1212,7 @@ * @author Michawiki */ $messages['dsb'] = array( - 'viewapc' = 'Informacije wó APC', + 'apc' = 'Informacije wó APC', 'apc-desc' = 'APC-cache z MediaWiki [[Special:ViewAPC|se woglědaś a wobźěłaś]]', 'right-apc' = 'Wše funkcije w [[Special:ViewAPC|ViewAPC]] wužywaś', 'viewapc-apc-not-available' = 'Žedne informacije wó cache k dispoziciji. @@ -1324,7 +1324,7 @@ * @author ZaDiak */ $messages['el'] = array( - 'viewapc' = 'Πληροφορίες APC', + 'apc' = 'Πληροφορίες APC',
[MediaWiki-CVS] SVN: [65740] trunk/extensions/RPED
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65740
Revision: 65740
Author: demon
Date: 2010-05-01 15:48:47 + (Sat, 01 May 2010)
Log Message:
---
Spacing, coding style tweaks, remove unneeded checks for MEDIAWIKI on non-entry
points
Modified Paths:
--
trunk/extensions/RPED/ApiRPED.php
trunk/extensions/RPED/RPED.hooks.php
Modified: trunk/extensions/RPED/ApiRPED.php
===
--- trunk/extensions/RPED/ApiRPED.php 2010-05-01 14:58:30 UTC (rev 65739)
+++ trunk/extensions/RPED/ApiRPED.php 2010-05-01 15:48:47 UTC (rev 65740)
@@ -1,105 +1,101 @@
?php
-if (!defined('MEDIAWIKI')) {
-die();
-}
class ApiRPED extends ApiBase {
-public function __construct($main, $action) {
- parent :: __construct($main, $action);
-}
-public function execute() {
-global $wgUser;
-/*if (!$this-userCanExecute( $wgUser )) {
-$this-displayRestrictionError();
-return;
- }*/
+ public function __construct( $main, $action ) {
+ parent::__construct( $main, $action );
+ }
+
+ public function execute() {
+ global $wgUser;
+ /*if (!$this-userCanExecute( $wgUser )) {
+ $this-displayRestrictionError();
+ return;
+ }*/
- if (!$wgUser-isAllowed( 'rped' ) ){
- $this-displayRestrictionError();
- return;
- }
+ if( !$wgUser-isAllowed( 'rped' ) ) {
+ $this-displayRestrictionError();
+ return;
+ }
-
#$dbw-insert('rped_pages',array('rped_page_title' = $subValue));
-$params = $this-extractRequestParams(false);
- /*foreach ($params as $key = $value) {
- $dbw-insert('rped_page',array('rped_page_title' = $key));
- $dbw-insert('rped_page',array('rped_page_title' = $value));
- }*/
-foreach ($params as $key = $value) {
-if ($key!=null $value!=null){
- ApiRPED::paramProcess($key,$value);
- }
-
+ $params = $this-extractRequestParams(false);
+ /*foreach ($params as $key = $value) {
+ $dbw-insert('rped_page',array('rped_page_title' =
$key));
+ $dbw-insert('rped_page',array('rped_page_title' =
$value));
+ }*/
+ foreach( $params as $key = $value ) {
+ if( $key != null $value!= null ) {
+ ApiRPED::paramProcess( $key,$value );
+ }
}
return;
}
-public function paramProcess($key,$value){
- $dbr = wfGetDB( DB_SLAVE );
- $dbw = wfGetDB( DB_MASTER );
- $myInputNum=0;
- for ($count=0; $countstrlen($value); $count++){
- if (substr($value,$count,1)=='|'){
- $myInputNum++;
- } else {
- if (!isset($myInput[$myInputNum])){
- $myInput[$myInputNum]='';
+ public function paramProcess( $key,$value ){
+ $dbr = wfGetDB( DB_SLAVE );
+ $dbw = wfGetDB( DB_MASTER );
+ $myInputNum = 0;
+ $strLen = strlen( $value );
+ for( $count = 0; $count $strLen; $count++ ) {
+ if ( substr( $value, $count, 1 ) == '|' ){
+ $myInputNum++;
+ } else {
+ if ( !isset( $myInput[$myInputNum] ) ) {
+ $myInput[$myInputNum] = '';
+ }
+ if ( substr( $value, $count, 1 ) == ' ' ) {
+ $myInput[$myInputNum] .= '_';
+ } else {
+ $myInput[$myInputNum] .= substr(
$value, $count, 1 );
+ }
+ }
}
- if (substr($value,$count,1)==' '){
- $myInput[$myInputNum].='_';
- } else {
- $myInput[$myInputNum].=substr($value,$count,1);
+ if( isset( $myInput ) ) {
+ foreach( $myInput as $subValue ) {
+ if ( isset( $subValue ) $subValue !== null )
{
+ $existCheck = null;
+ $existCheck = $dbr-selectRow(
'rped_page', 'rped_page_title',
+ array( 'rped_page_title' =
$subValue ) );
+
#$dbw-insert('rped_page',array('rped_page_title' = key: .$key));
+
#$dbw-insert('rped_page',array('rped_page_title' = subValue: .$subValue));
+
[MediaWiki-CVS] SVN: [65741] trunk/extensions/APC/APC.alias.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65741 Revision: 65741 Author: siebrand Date: 2010-05-01 16:25:24 + (Sat, 01 May 2010) Log Message: --- Fix old special page alias Modified Paths: -- trunk/extensions/APC/APC.alias.php Modified: trunk/extensions/APC/APC.alias.php === --- trunk/extensions/APC/APC.alias.php 2010-05-01 15:48:47 UTC (rev 65740) +++ trunk/extensions/APC/APC.alias.php 2010-05-01 16:25:24 UTC (rev 65741) @@ -10,7 +10,7 @@ /** English */ $aliases['en'] = array( - 'APC' = array( 'APC', 'APC' ), + 'APC' = array( 'APC', 'ViewAPC' ), ); /** Arabic (العربية) */ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65742] trunk/extensions/Translate/Translate.alias.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65742 Revision: 65742 Author: siebrand Date: 2010-05-01 16:26:21 + (Sat, 01 May 2010) Log Message: --- Add missing special page alias Modified Paths: -- trunk/extensions/Translate/Translate.alias.php Modified: trunk/extensions/Translate/Translate.alias.php === --- trunk/extensions/Translate/Translate.alias.php 2010-05-01 16:25:24 UTC (rev 65741) +++ trunk/extensions/Translate/Translate.alias.php 2010-05-01 16:26:21 UTC (rev 65742) @@ -20,6 +20,7 @@ 'PageTranslation'= array( 'PageTranslation' ), 'ImportTranslations' = array( 'ImportTranslations' ), 'FirstSteps' = array( 'FirstSteps' ), + 'SupportedLanguages' = array( 'SupportedLanguages' ), ); /** Afrikaans (Afrikaans) */ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65743] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65743
Revision: 65743
Author: siebrand
Date: 2010-05-01 16:33:58 + (Sat, 01 May 2010)
Log Message:
---
* update special page title for FirstSteps
* fix title and summary loading on SupportedLanguages
Modified Paths:
--
trunk/extensions/Translate/FirstSteps.i18n.php
trunk/extensions/Translate/SpecialSupportedLanguages.php
Modified: trunk/extensions/Translate/FirstSteps.i18n.php
===
--- trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 16:26:21 UTC
(rev 65742)
+++ trunk/extensions/Translate/FirstSteps.i18n.php 2010-05-01 16:33:58 UTC
(rev 65743)
@@ -14,7 +14,7 @@
$messages['en'] = array(
'firststeps' = 'First steps',
'translate-fs-pagetitle-done' = ' - done!',
- 'translate-fs-pagetitle' = 'Start translating - $1',
+ 'translate-fs-pagetitle' = 'Getting started wizard - $1',
'translate-fs-signup-title' = 'Sign up',
'translate-fs-settings-title' = 'Configure your preferences',
'translate-fs-userpage-title' = 'Create your user page',
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:26:21 UTC (rev 65742)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:33:58 UTC (rev 65743)
@@ -13,6 +13,9 @@
public function execute( $par ) {
global $wgLang, $wgOut;
+ $this-outputHeader();
+ $this-setHeaders();
+
$locals = LanguageNames::getNames( $wgLang-getCode(),
LanguageNames::FALLBACK_NORMAL,
LanguageNames::LIST_MW_AND_CLDR
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65744] trunk/extensions/Translate/SpecialSupportedLanguages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65744
Revision: 65744
Author: siebrand
Date: 2010-05-01 16:50:40 + (Sat, 01 May 2010)
Log Message:
---
Add link to portal in SupportedLanguages
Modified Paths:
--
trunk/extensions/Translate/SpecialSupportedLanguages.php
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:33:58 UTC (rev 65743)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:50:40 UTC (rev 65744)
@@ -59,8 +59,28 @@
$lb-execute();
global $wgUser;
$skin = $wgUser-getSkin();
+
+ $parser = new Parser;
+ $parser-setOutputType( 'wiki' );
+ $parserOptions = new ParserOptions;
+
foreach ( array_keys( $users ) as $code ) {
- $wgOut-addWikiText( == [$code] {$locals[$code]} -
{$natives[$code]} == );
+ $portalTitle = Title::makeTitleSafe( NS_PORTAL, $code );
+ $linkText = $parser-parse(
+ ==[$code] {$locals[$code]} -
{$natives[$code]}==,
+ $portalTitle /* as dummy */,
+ $wgUser,
+ $parserOptions
+ );
+ $portalLink = link(
+ $portalTitle,
+ $linkText,
+ array( 'id' = $code ),
+ array(),
+ attay( 'known', 'noclasses' )
+ );
+
+ $wgOut-addHtml( $portalLink );
foreach ( $users[$code] as $index = $username ) {
$title = Title::makeTitleSafe( NS_USER,
$username );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65745] trunk/extensions/Translate/SpecialSupportedLanguages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65745
Revision: 65745
Author: siebrand
Date: 2010-05-01 16:52:31 + (Sat, 01 May 2010)
Log Message:
---
Fix parser parameters from r65744
Modified Paths:
--
trunk/extensions/Translate/SpecialSupportedLanguages.php
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:50:40 UTC (rev 65744)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:52:31 UTC (rev 65745)
@@ -69,7 +69,6 @@
$linkText = $parser-parse(
==[$code] {$locals[$code]} -
{$natives[$code]}==,
$portalTitle /* as dummy */,
- $wgUser,
$parserOptions
);
$portalLink = link(
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65746] trunk/extensions/Translate/SpecialSupportedLanguages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65746 Revision: 65746 Author: siebrand Date: 2010-05-01 16:53:14 + (Sat, 01 May 2010) Log Message: --- Fix typo in r65744 Modified Paths: -- trunk/extensions/Translate/SpecialSupportedLanguages.php Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php === --- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01 16:52:31 UTC (rev 65745) +++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01 16:53:14 UTC (rev 65746) @@ -76,7 +76,7 @@ $linkText, array( 'id' = $code ), array(), - attay( 'known', 'noclasses' ) + array( 'known', 'noclasses' ) ); $wgOut-addHtml( $portalLink ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65747] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65747
Revision: 65747
Author: siebrand
Date: 2010-05-01 17:05:39 + (Sat, 01 May 2010)
Log Message:
---
Fix link to portal (hopefully)
Modified Paths:
--
trunk/extensions/Translate/SpecialSupportedLanguages.php
trunk/extensions/Translate/Translate.i18n.php
trunk/extensions/Translate/groups/mediawiki-defines.txt
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
16:53:14 UTC (rev 65746)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
17:05:39 UTC (rev 65747)
@@ -60,26 +60,17 @@
global $wgUser;
$skin = $wgUser-getSkin();
- $parser = new Parser;
- $parser-setOutputType( 'wiki' );
- $parserOptions = new ParserOptions;
-
foreach ( array_keys( $users ) as $code ) {
$portalTitle = Title::makeTitleSafe( NS_PORTAL, $code );
- $linkText = $parser-parse(
- ==[$code] {$locals[$code]} -
{$natives[$code]}==,
- $portalTitle /* as dummy */,
- $parserOptions
- );
- $portalLink = link(
+ $portalLink = $skin-link(
$portalTitle,
- $linkText,
+ wfMsg( 'supportedlanguages-portallink', $code,
$locals[$code], $natives[$code] ),
array( 'id' = $code ),
array(),
array( 'known', 'noclasses' )
);
- $wgOut-addHtml( $portalLink );
+ $wgOut-addHTML( $portalLink );
foreach ( $users[$code] as $index = $username ) {
$title = Title::makeTitleSafe( NS_USER,
$username );
Modified: trunk/extensions/Translate/Translate.i18n.php
===
--- trunk/extensions/Translate/Translate.i18n.php 2010-05-01 16:53:14 UTC
(rev 65746)
+++ trunk/extensions/Translate/Translate.i18n.php 2010-05-01 17:05:39 UTC
(rev 65747)
@@ -225,6 +225,7 @@
If you translate to a language and your name is not included, please add your
name to the list of translators on the [[:Category:Languages|portal]] for that
language.
See the menu bar for a link to the portal for the language of your
preference.',
+ 'supportedlanguages-portallink' = '==[$1] $2 - $3=='
'translate-save' = 'Save ($1)',
Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt
===
--- trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-05-01
16:53:14 UTC (rev 65746)
+++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-05-01
17:05:39 UTC (rev 65747)
@@ -1143,8 +1143,9 @@
descmsg = translate-desc
file = Translate/Translate.i18n.php
aliasfile = Translate/Translate.alias.php
-optional = translate-page-paging-links, translate-languagestats-groups
+optional = translate-page-paging-links, translate-languagestats-groups,
supportedlanguages-portallink
+
Translate - Page Translation
id = ext-translate-pagetranslation
file = Translate/PageTranslation.i18n.php
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65748] trunk/extensions/Translate/Translate.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65748 Revision: 65748 Author: siebrand Date: 2010-05-01 17:07:08 + (Sat, 01 May 2010) Log Message: --- Fix parse error Modified Paths: -- trunk/extensions/Translate/Translate.i18n.php Modified: trunk/extensions/Translate/Translate.i18n.php === --- trunk/extensions/Translate/Translate.i18n.php 2010-05-01 17:05:39 UTC (rev 65747) +++ trunk/extensions/Translate/Translate.i18n.php 2010-05-01 17:07:08 UTC (rev 65748) @@ -225,7 +225,7 @@ If you translate to a language and your name is not included, please add your name to the list of translators on the [[:Category:Languages|portal]] for that language. See the menu bar for a link to the portal for the language of your preference.', - 'supportedlanguages-portallink' = '==[$1] $2 - $3==' + 'supportedlanguages-portallink' = '==[$1] $2 - $3==', 'translate-save' = 'Save ($1)', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65749] trunk/extensions/Translate
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65749
Revision: 65749
Author: siebrand
Date: 2010-05-01 17:23:42 + (Sat, 01 May 2010)
Log Message:
---
Really fix link to portal in SupportedLanguages
Modified Paths:
--
trunk/extensions/Translate/SpecialSupportedLanguages.php
trunk/extensions/Translate/Translate.i18n.php
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
17:07:08 UTC (rev 65748)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
17:23:42 UTC (rev 65749)
@@ -70,7 +70,7 @@
array( 'known', 'noclasses' )
);
- $wgOut-addHTML( $portalLink );
+ $wgOut-addHTML( h2 . $portalLink . /h2 );
foreach ( $users[$code] as $index = $username ) {
$title = Title::makeTitleSafe( NS_USER,
$username );
Modified: trunk/extensions/Translate/Translate.i18n.php
===
--- trunk/extensions/Translate/Translate.i18n.php 2010-05-01 17:07:08 UTC
(rev 65748)
+++ trunk/extensions/Translate/Translate.i18n.php 2010-05-01 17:23:42 UTC
(rev 65749)
@@ -225,7 +225,7 @@
If you translate to a language and your name is not included, please add your
name to the list of translators on the [[:Category:Languages|portal]] for that
language.
See the menu bar for a link to the portal for the language of your
preference.',
- 'supportedlanguages-portallink' = '==[$1] $2 - $3==',
+ 'supportedlanguages-portallink' = '[$1] $2 - $3',
'translate-save' = 'Save ($1)',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65750] trunk/extensions/Translate/SpecialSupportedLanguages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65750
Revision: 65750
Author: siebrand
Date: 2010-05-01 17:28:39 + (Sat, 01 May 2010)
Log Message:
---
Add nicer title
Modified Paths:
--
trunk/extensions/Translate/SpecialSupportedLanguages.php
Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php
===
--- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
17:23:42 UTC (rev 65749)
+++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01
17:28:39 UTC (rev 65750)
@@ -59,13 +59,17 @@
$lb-execute();
global $wgUser;
$skin = $wgUser-getSkin();
+ $portalText = wfMsg( 'portal' );
foreach ( array_keys( $users ) as $code ) {
$portalTitle = Title::makeTitleSafe( NS_PORTAL, $code );
$portalLink = $skin-link(
$portalTitle,
wfMsg( 'supportedlanguages-portallink', $code,
$locals[$code], $natives[$code] ),
- array( 'id' = $code ),
+ array(
+ 'id' = $code
+ 'title' = $portalText . ' ' .
$locals[$code]
+ ),
array(),
array( 'known', 'noclasses' )
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65751] trunk/extensions/Translate/SpecialSupportedLanguages.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65751 Revision: 65751 Author: siebrand Date: 2010-05-01 17:29:33 + (Sat, 01 May 2010) Log Message: --- Fix syntax error in r65750 Modified Paths: -- trunk/extensions/Translate/SpecialSupportedLanguages.php Modified: trunk/extensions/Translate/SpecialSupportedLanguages.php === --- trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01 17:28:39 UTC (rev 65750) +++ trunk/extensions/Translate/SpecialSupportedLanguages.php2010-05-01 17:29:33 UTC (rev 65751) @@ -67,7 +67,7 @@ $portalTitle, wfMsg( 'supportedlanguages-portallink', $code, $locals[$code], $natives[$code] ), array( - 'id' = $code + 'id' = $code, 'title' = $portalText . ' ' . $locals[$code] ), array(), ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65752] trunk/extensions/Wikidata/OmegaWiki/type.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65752
Revision: 65752
Author: kipcool
Date: 2010-05-01 17:47:03 + (Sat, 01 May 2010)
Log Message:
---
urlencode only for (otherwise, links with / were broken)
Modified Paths:
--
trunk/extensions/Wikidata/OmegaWiki/type.php
Modified: trunk/extensions/Wikidata/OmegaWiki/type.php
===
--- trunk/extensions/Wikidata/OmegaWiki/type.php2010-05-01 17:29:33 UTC
(rev 65751)
+++ trunk/extensions/Wikidata/OmegaWiki/type.php2010-05-01 17:47:03 UTC
(rev 65752)
@@ -27,8 +27,8 @@
global $wgArticlePath;
- $titleNoSpace = str_replace( , _, $title ) ;
- $url = str_replace( $1, $nameSpace . ':' . urlencode( $titleNoSpace
), $wgArticlePath );
+ $myTitle = str_replace( , urlencode() , $title ) ;
+ $url = str_replace( $1, $nameSpace . ':' . $myTitle , $wgArticlePath
);
if ( $usedc ) {
$dc = wdGetDataSetContext();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65753] trunk/extensions/Wikidata/OmegaWiki/Controller.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65753 Revision: 65753 Author: kipcool Date: 2010-05-01 18:10:18 + (Sat, 01 May 2010) Log Message: --- Corrected bug preventing to add an option with no language specified. Modified Paths: -- trunk/extensions/Wikidata/OmegaWiki/Controller.php Modified: trunk/extensions/Wikidata/OmegaWiki/Controller.php === --- trunk/extensions/Wikidata/OmegaWiki/Controller.php 2010-05-01 17:47:03 UTC (rev 65752) +++ trunk/extensions/Wikidata/OmegaWiki/Controller.php 2010-05-01 18:10:18 UTC (rev 65753) @@ -545,6 +545,7 @@ $attributeId = $idPath-getKeyStack()-peek( 0 )-classAttributeId; $optionMeaningId = $record-optionAttributeOption; $languageId = $record-language; + if ( $languageId == NULL ) $languageId = 0 ; if ( $optionMeaningId ) addOptionAttributeOption( $attributeId, $optionMeaningId, $languageId ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65754] trunk
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65754 Revision: 65754 Author: ialex Date: 2010-05-01 18:25:33 + (Sat, 01 May 2010) Log Message: --- svn:eol-style native Property Changed: trunk/extensions/Collection/js/check_load_from_localstorage.js trunk/extensions/Collection/js/jquery.json.js trunk/extensions/Collection/js/jstorage.js trunk/extensions/JS2Support/AddMediaWizard/README trunk/extensions/JS2Support/UsabilityInitiative/README trunk/extensions/JS2Support/UsabilityInitiative/ScriptLoaderUsabilityInitiative.php trunk/extensions/JS2Support/UsabilityInitiative/loader.js trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php Property changes on: trunk/extensions/Collection/js/check_load_from_localstorage.js ___ Added: svn:eol-style + native Property changes on: trunk/extensions/Collection/js/jquery.json.js ___ Added: svn:eol-style + native Property changes on: trunk/extensions/Collection/js/jstorage.js ___ Added: svn:eol-style + native Property changes on: trunk/extensions/JS2Support/AddMediaWizard/README ___ Added: svn:eol-style + native Property changes on: trunk/extensions/JS2Support/UsabilityInitiative/README ___ Added: svn:eol-style + native Property changes on: trunk/extensions/JS2Support/UsabilityInitiative/ScriptLoaderUsabilityInitiative.php ___ Added: svn:eol-style + native Property changes on: trunk/extensions/JS2Support/UsabilityInitiative/loader.js ___ Added: svn:eol-style + native Property changes on: trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php ___ 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: [65755] trunk/extensions/CodeReview/api/ApiCodeComments.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65755
Revision: 65755
Author: catrope
Date: 2010-05-01 19:09:33 + (Sat, 01 May 2010)
Log Message:
---
CodeReview: (bug 23366) Add revids to list=codecomments output
Modified Paths:
--
trunk/extensions/CodeReview/api/ApiCodeComments.php
Modified: trunk/extensions/CodeReview/api/ApiCodeComments.php
===
--- trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 18:25:33 UTC
(rev 65754)
+++ trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 19:09:33 UTC
(rev 65755)
@@ -76,6 +76,8 @@
private function formatRow( $row ) {
$item = array();
+ if ( isset( $this-props['revid'] ) )
+ $item['revid'] = $row-cc_rev_id;
if ( isset( $this-props['timestamp'] ) )
$item['timestamp'] = wfTimestamp( TS_ISO_8601,
$row-cc_timestamp );
if ( isset( $this-props['user'] ) )
@@ -102,12 +104,13 @@
),
'prop' = array (
ApiBase :: PARAM_ISMULTI = true,
- ApiBase :: PARAM_DFLT =
'timestamp|user|revision',
+ ApiBase :: PARAM_DFLT =
'timestamp|user|revision|revid',
ApiBase :: PARAM_TYPE = array (
'timestamp',
'user',
'revision',
'text',
+ 'revid',
),
),
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65756] trunk/extensions/CodeReview/api/ApiCodeComments.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65756 Revision: 65756 Author: catrope Date: 2010-05-01 19:13:38 + (Sat, 01 May 2010) Log Message: --- CodeReview: (bug 23367) Deprecate ccprop=revision in favor of ccprop=status in list=codecomments . Old prop kept for backward compatibility Modified Paths: -- trunk/extensions/CodeReview/api/ApiCodeComments.php Modified: trunk/extensions/CodeReview/api/ApiCodeComments.php === --- trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 19:09:33 UTC (rev 65755) +++ trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 19:13:38 UTC (rev 65756) @@ -38,6 +38,8 @@ if ( is_null( $params['repo'] ) ) $this-dieUsageMsg( array( 'missingparam', 'repo' ) ); $this-props = array_flip( $params['prop'] ); + if ( isset( $this-props['revision'] ) ) + $this-setWarning( 'ccprop=revision has been deprecated in favor of ccprop=status' ); $listview = new CodeCommentsListView( $params['repo'] ); if ( is_null( $listview-getRepo() ) ) @@ -82,7 +84,7 @@ $item['timestamp'] = wfTimestamp( TS_ISO_8601, $row-cc_timestamp ); if ( isset( $this-props['user'] ) ) $item['user'] = $row-cc_user_text; - if ( isset( $this-props['revision'] ) ) + if ( isset( $this-props['revision'] ) || isset( $this-props['status'] ) ) $item['status'] = $row-cr_status; if ( isset( $this-props['text'] ) ) ApiResult::setContent( $item, $row-cc_text ); @@ -104,13 +106,14 @@ ), 'prop' = array ( ApiBase :: PARAM_ISMULTI = true, - ApiBase :: PARAM_DFLT = 'timestamp|user|revision|revid', + ApiBase :: PARAM_DFLT = 'timestamp|user|status|revid', ApiBase :: PARAM_TYPE = array ( 'timestamp', 'user', - 'revision', + 'status', 'text', 'revid', + 'revision', ), ), ); @@ -121,7 +124,7 @@ 'repo' = 'Name of the repository', 'limit' = 'How many comments to return', 'start' = 'Timestamp to start listing at', - 'prop' = 'Which properties to return', + 'prop' = 'Which properties to return. revision is a deprecated alias for status', ); } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65758] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65758 Revision: 65758 Author: raymond Date: 2010-05-01 19:24:56 + (Sat, 01 May 2010) Log Message: --- * (bug 23364) Changed native name for Azerbaijani. Modified Paths: -- trunk/phase3/RELEASE-NOTES trunk/phase3/languages/Names.php Modified: trunk/phase3/RELEASE-NOTES === --- trunk/phase3/RELEASE-NOTES 2010-05-01 19:15:20 UTC (rev 65757) +++ trunk/phase3/RELEASE-NOTES 2010-05-01 19:24:56 UTC (rev 65758) @@ -163,6 +163,7 @@ * (bug 23156) Commafy and search normalization updated for Belarusian (Taraškievica) * (bug 23283) Native name for Old English - Ænglisc +* (bug 23364) Native name for Azerbaijani - Azərbaycanca == Compatibility == Modified: trunk/phase3/languages/Names.php === --- trunk/phase3/languages/Names.php2010-05-01 19:15:20 UTC (rev 65757) +++ trunk/phase3/languages/Names.php2010-05-01 19:24:56 UTC (rev 65758) @@ -25,7 +25,7 @@ 'av' = 'Авар', # Avar 'avk' = 'Kotava', # Kotava 'ay' = 'Aymar aru',# Aymara - 'az' = 'Azərbaycan', # Azerbaijani + 'az' = 'Azərbaycanca', # Azerbaijani 'ba' = 'Башҡорт', # Bashkir 'bar' = 'Boarisch',# Bavarian (Austro-Bavarian and South Tyrolean) 'bat-smg' = 'Žemaitėška', # Samogitian ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65759] trunk/extensions/CodeReview/api
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65759
Revision: 65759
Author: ashley
Date: 2010-05-01 19:26:16 + (Sat, 01 May 2010)
Log Message:
---
CodeReview: coding style tweaks for API modules
Modified Paths:
--
trunk/extensions/CodeReview/api/ApiCodeComments.php
trunk/extensions/CodeReview/api/ApiCodeDiff.php
trunk/extensions/CodeReview/api/ApiCodeTestUpload.php
trunk/extensions/CodeReview/api/ApiCodeUpdate.php
Modified: trunk/extensions/CodeReview/api/ApiCodeComments.php
===
--- trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 19:24:56 UTC
(rev 65758)
+++ trunk/extensions/CodeReview/api/ApiCodeComments.php 2010-05-01 19:26:16 UTC
(rev 65759)
@@ -1,11 +1,11 @@
?php
-/*
+/**
* Created on Oct 29, 2008
*
* API for MediaWiki 1.8+
*
- * Copyright (C) 2008 Bryan Tong Minh bryan.tongm...@gmail.com
+ * Copyright © 2008 Bryan Tong Minh bryan.tongm...@gmail.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -35,19 +35,23 @@
$this-dieUsage( 'You don\'t have permission to view
code comments', 'permissiondenied' );
}
$params = $this-extractRequestParams();
- if ( is_null( $params['repo'] ) )
+ if ( is_null( $params['repo'] ) ) {
$this-dieUsageMsg( array( 'missingparam', 'repo' ) );
+ }
$this-props = array_flip( $params['prop'] );
- if ( isset( $this-props['revision'] ) )
+ if ( isset( $this-props['revision'] ) ) {
$this-setWarning( 'ccprop=revision has been deprecated
in favor of ccprop=status' );
+ }
$listview = new CodeCommentsListView( $params['repo'] );
- if ( is_null( $listview-getRepo() ) )
+ if ( is_null( $listview-getRepo() ) ) {
$this-dieUsage( Invalid repo ``{$params['repo']}'',
'invalidrepo' );
+ }
$pager = $listview-getPager();
- if ( !is_null( $params['start'] ) )
+ if ( !is_null( $params['start'] ) ) {
$pager-setOffset( $this-getDB()-timestamp(
$params['start'] ) );
+ }
$limit = $params['limit'];
$pager-setLimit( $limit );
@@ -78,36 +82,41 @@
private function formatRow( $row ) {
$item = array();
- if ( isset( $this-props['revid'] ) )
+ if ( isset( $this-props['revid'] ) ) {
$item['revid'] = $row-cc_rev_id;
- if ( isset( $this-props['timestamp'] ) )
+ }
+ if ( isset( $this-props['timestamp'] ) ) {
$item['timestamp'] = wfTimestamp( TS_ISO_8601,
$row-cc_timestamp );
- if ( isset( $this-props['user'] ) )
+ }
+ if ( isset( $this-props['user'] ) ) {
$item['user'] = $row-cc_user_text;
- if ( isset( $this-props['revision'] ) || isset(
$this-props['status'] ) )
+ }
+ if ( isset( $this-props['revision'] ) || isset(
$this-props['status'] ) ) {
$item['status'] = $row-cr_status;
- if ( isset( $this-props['text'] ) )
+ }
+ if ( isset( $this-props['text'] ) ) {
ApiResult::setContent( $item, $row-cc_text );
+ }
return $item;
}
public function getAllowedParams() {
- return array (
+ return array(
'repo' = null,
- 'limit' = array (
- ApiBase :: PARAM_DFLT = 10,
- ApiBase :: PARAM_TYPE = 'limit',
- ApiBase :: PARAM_MIN = 1,
- ApiBase :: PARAM_MAX = ApiBase :: LIMIT_BIG1,
- ApiBase :: PARAM_MAX2 = ApiBase :: LIMIT_BIG2
+ 'limit' = array(
+ ApiBase::PARAM_DFLT = 10,
+ ApiBase::PARAM_TYPE = 'limit',
+ ApiBase::PARAM_MIN = 1,
+ ApiBase::PARAM_MAX = ApiBase::LIMIT_BIG1,
+ ApiBase::PARAM_MAX2 = ApiBase::LIMIT_BIG2
),
'start' = array(
- ApiBase :: PARAM_TYPE = 'timestamp'
+ ApiBase::PARAM_TYPE = 'timestamp'
),
- 'prop' = array (
- ApiBase :: PARAM_ISMULTI = true,
- ApiBase :: PARAM_DFLT =
[MediaWiki-CVS] SVN: [65760] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65760
Revision: 65760
Author: platonides
Date: 2010-05-01 20:16:13 + (Sat, 01 May 2010)
Log Message:
---
Bug 23371: Fix CSRF similar to r64677 covering the other three execute()
branches. Checks added to mailPassword() and addNewAccountInternal()
(covers addNewAccount addNewAccountMailPassword).
Paranoia: Use different tokens for login and account creation.
*For wikis allowing public account creation, an attacker could create
many accounts via proxying users, avoiding ip blocks, the anon gets
logged in (wikis using ConfirmEdit to request a captcha for createaccount
are protected from this).
*If the victims were logged users, the attacker could create the
accounts by email and flood innocent parties using the wiki as gateway.
*If the victim was a sysop, the attacker could not only bypass the
captcha protection, but also the username blacklist.
*It also provides a way to bypass the blocks and ping limit for sending
many password resets flooding its targets.
*On private wikis an account creation by targeting a sysop may expose
confidential information.
Modified Paths:
--
trunk/phase3/includes/specials/SpecialUserlogin.php
trunk/phase3/includes/templates/Userlogin.php
Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2010-05-01 19:26:16 UTC
(rev 65759)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2010-05-01 20:16:13 UTC
(rev 65760)
@@ -72,7 +72,7 @@
$this-mRemember = $request-getCheck( 'wpRemember' );
$this-mLanguage = $request-getText( 'uselang' );
$this-mSkipCookieCheck = $request-getCheck(
'wpSkipCookieCheck' );
- $this-mToken = $request-getVal( 'wpLoginToken' );
+ $this-mToken = ($this-mType == 'signup' ) ? $request-getVal(
'wpCreateaccountToken' ) : $request-getVal( 'wpLoginToken' );
if ( $wgRedirectOnLogin ) {
$this-mReturnTo = $wgRedirectOnLogin;
@@ -251,6 +251,25 @@
return false;
}
+ # Request forgery checks.
+ if ( !self::getCreateaccountToken() ) {
+ self::setCreateaccountToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # The user didn't pass a createaccount token
+ if ( !$this-mToken ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # Validate the createaccount token
+ if ( $this-mToken !== self::getCreateaccountToken() ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
# Check permissions
if ( !$wgUser-isAllowed( 'createaccount' ) ) {
$this-userNotPrivilegedMessage();
@@ -263,7 +282,7 @@
$ip = wfGetIP();
if ( $wgUser-isDnsBlacklisted( $ip, true /* check
$wgProxyWhitelist */ ) ) {
$this-mainLoginForm( wfMsg(
'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
- return;
+ return false;
}
# Now create a dummy user ($u) and check if it is valid
@@ -340,6 +359,7 @@
return false;
}
+ self::clearCreateaccountToken();
return $this-initUser( $u, false );
}
@@ -683,20 +703,33 @@
return;
}
- # Check against blocked IPs
- # fixme -- should we not?
+ # Check against blocked IPs so blocked users can't flood admins
+ # with password resets
if( $wgUser-isBlocked() ) {
$this-mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
return;
}
- // Check for hooks
+ # Check for hooks
$error = null;
if ( ! wfRunHooks( 'UserLoginMailPassword', array(
$this-mName, $error ) ) ) {
$this-mainLoginForm( $error );
return;
}
+ # If the user doesn't have a login token yet, set one.
+ if ( !self::getLoginToken() ) {
+ self::setLoginToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
+ # If the user didn't pass a login token, tell them we need one
+
[MediaWiki-CVS] SVN: [65761] branches/wmf/1.16wmf4/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65761
Revision: 65761
Author: catrope
Date: 2010-05-01 20:24:34 + (Sat, 01 May 2010)
Log Message:
---
1.16wmf4: MFT r65760
Modified Paths:
--
branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
branches/wmf/1.16wmf4/includes/templates/Userlogin.php
Property Changed:
branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
Modified: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
===
--- branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
2010-05-01 20:16:13 UTC (rev 65760)
+++ branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php
2010-05-01 20:24:34 UTC (rev 65761)
@@ -72,7 +72,7 @@
$this-mRemember = $request-getCheck( 'wpRemember' );
$this-mLanguage = $request-getText( 'uselang' );
$this-mSkipCookieCheck = $request-getCheck(
'wpSkipCookieCheck' );
- $this-mToken = $request-getVal( 'wpLoginToken' );
+ $this-mToken = ($this-mType == 'signup' ) ? $request-getVal(
'wpCreateaccountToken' ) : $request-getVal( 'wpLoginToken' );
if ( $wgRedirectOnLogin ) {
$this-mReturnTo = $wgRedirectOnLogin;
@@ -251,6 +251,25 @@
return false;
}
+ # Request forgery checks.
+ if ( !self::getCreateaccountToken() ) {
+ self::setCreateaccountToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # The user didn't pass a createaccount token
+ if ( !$this-mToken ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # Validate the createaccount token
+ if ( $this-mToken !== self::getCreateaccountToken() ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
# Check permissions
if ( !$wgUser-isAllowed( 'createaccount' ) ) {
$this-userNotPrivilegedMessage();
@@ -263,7 +282,7 @@
$ip = wfGetIP();
if ( $wgUser-isDnsBlacklisted( $ip, true /* check
$wgProxyWhitelist */ ) ) {
$this-mainLoginForm( wfMsg(
'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
- return;
+ return false;
}
# Now create a dummy user ($u) and check if it is valid
@@ -340,6 +359,7 @@
return false;
}
+ self::clearCreateaccountToken();
return $this-initUser( $u, false );
}
@@ -683,20 +703,33 @@
return;
}
- # Check against blocked IPs
- # fixme -- should we not?
+ # Check against blocked IPs so blocked users can't flood admins
+ # with password resets
if( $wgUser-isBlocked() ) {
$this-mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
return;
}
- // Check for hooks
+ # Check for hooks
$error = null;
if ( ! wfRunHooks( 'UserLoginMailPassword', array(
$this-mName, $error ) ) ) {
$this-mainLoginForm( $error );
return;
}
+ # If the user doesn't have a login token yet, set one.
+ if ( !self::getLoginToken() ) {
+ self::setLoginToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
+ # If the user didn't pass a login token, tell them we need one
+ if ( !$this-mToken ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
# Check against the rate limiter
if( $wgUser-pingLimiter( 'mailpassword' ) ) {
$wgOut-rateLimited();
@@ -717,6 +750,12 @@
return;
}
+ # Validate the login token
+ if ( $this-mToken !== self::getLoginToken() ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
# Check against password throttle
if ( $u-isPasswordReminderThrottled() ) {
global
[MediaWiki-CVS] SVN: [65762] branches/REL1_16/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65762
Revision: 65762
Author: platonides
Date: 2010-05-01 20:27:26 + (Sat, 01 May 2010)
Log Message:
---
Backport r65760.
We may even want to backport it to 1.15.
Modified Paths:
--
branches/REL1_16/phase3/RELEASE-NOTES
branches/REL1_16/phase3/includes/specials/SpecialUserlogin.php
branches/REL1_16/phase3/includes/templates/Userlogin.php
Modified: branches/REL1_16/phase3/RELEASE-NOTES
===
--- branches/REL1_16/phase3/RELEASE-NOTES 2010-05-01 20:24:34 UTC (rev
65761)
+++ branches/REL1_16/phase3/RELEASE-NOTES 2010-05-01 20:27:26 UTC (rev
65762)
@@ -40,6 +40,9 @@
you have the DBA extension for PHP installed, this will improve performance
further.
+* (bug 23371) Fixed holes in Special:Userlogin which could lead to abuse of
+the system, and disclosure of information from private wikis.
+
== Changes since 1.16 beta 2 ==
* Fixed bugs in the [[Special:Userlogin]] and [[Special:Emailuser]] handling of
Modified: branches/REL1_16/phase3/includes/specials/SpecialUserlogin.php
===
--- branches/REL1_16/phase3/includes/specials/SpecialUserlogin.php
2010-05-01 20:24:34 UTC (rev 65761)
+++ branches/REL1_16/phase3/includes/specials/SpecialUserlogin.php
2010-05-01 20:27:26 UTC (rev 65762)
@@ -72,7 +72,7 @@
$this-mRemember = $request-getCheck( 'wpRemember' );
$this-mLanguage = $request-getText( 'uselang' );
$this-mSkipCookieCheck = $request-getCheck(
'wpSkipCookieCheck' );
- $this-mToken = $request-getVal( 'wpLoginToken' );
+ $this-mToken = ($this-mType == 'signup' ) ? $request-getVal(
'wpCreateaccountToken' ) : $request-getVal( 'wpLoginToken' );
if ( $wgRedirectOnLogin ) {
$this-mReturnTo = $wgRedirectOnLogin;
@@ -251,6 +251,25 @@
return false;
}
+ # Request forgery checks.
+ if ( !self::getCreateaccountToken() ) {
+ self::setCreateaccountToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # The user didn't pass a createaccount token
+ if ( !$this-mToken ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
+ # Validate the createaccount token
+ if ( $this-mToken !== self::getCreateaccountToken() ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return false;
+ }
+
# Check permissions
if ( !$wgUser-isAllowed( 'createaccount' ) ) {
$this-userNotPrivilegedMessage();
@@ -263,7 +282,7 @@
$ip = wfGetIP();
if ( $wgUser-isDnsBlacklisted( $ip, true /* check
$wgProxyWhitelist */ ) ) {
$this-mainLoginForm( wfMsg(
'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $ip ) . ')' );
- return;
+ return false;
}
# Now create a dummy user ($u) and check if it is valid
@@ -340,6 +359,7 @@
return false;
}
+ self::clearCreateaccountToken();
return $this-initUser( $u, false );
}
@@ -683,20 +703,33 @@
return;
}
- # Check against blocked IPs
- # fixme -- should we not?
+ # Check against blocked IPs so blocked users can't flood admins
+ # with password resets
if( $wgUser-isBlocked() ) {
$this-mainLoginForm( wfMsg( 'blocked-mailpassword' ) );
return;
}
- // Check for hooks
+ # Check for hooks
$error = null;
if ( ! wfRunHooks( 'UserLoginMailPassword', array(
$this-mName, $error ) ) ) {
$this-mainLoginForm( $error );
return;
}
+ # If the user doesn't have a login token yet, set one.
+ if ( !self::getLoginToken() ) {
+ self::setLoginToken();
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
+ # If the user didn't pass a login token, tell them we need one
+ if ( !$this-mToken ) {
+ $this-mainLoginForm( wfMsg( 'sessionfailure' ) );
+ return;
+ }
+
[MediaWiki-CVS] SVN: [65763] trunk/extensions/UsabilityInitiative
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65763
Revision: 65763
Author: catrope
Date: 2010-05-01 21:14:16 + (Sat, 01 May 2010)
Log Message:
---
UsabilityInitiative: Various fixes
* Fix Makefile broken by r65660 and run it to combine+minify the AMW code into
WikiEditor.combined.js and .min.js
* Fix some whitespace in AddMediaWizard.js while I'm in there
* Fix excessive $newElement.html() calls added in r65646, these are expensive.
Instead, build the HTML first, then add it with .html()
* Fix some style and a missing semicolon for r65646 and previous revs
Modified Paths:
--
trunk/extensions/UsabilityInitiative/Makefile
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/Makefile
===
--- trunk/extensions/UsabilityInitiative/Makefile 2010-05-01 20:27:26 UTC
(rev 65762)
+++ trunk/extensions/UsabilityInitiative/Makefile 2010-05-01 21:14:16 UTC
(rev 65763)
@@ -33,7 +33,7 @@
js/plugins/jquery.wikiEditor.highlight.js\
js/plugins/jquery.wikiEditor.preview.js\
js/plugins/jquery.wikiEditor.publish.js\
- js/plugins/jquery.wikiEditor.templateEditor.js\
+ js/plugins/jquery.wikiEditor.templateEditor.js\
js/plugins/jquery.wikiEditor.toc.js\
js/plugins/jquery.wikiEditor.toolbar.js
@@ -43,7 +43,7 @@
WikiEditor/Modules/Publish/Publish.js\
WikiEditor/Modules/Toc/Toc.js\
WikiEditor/Modules/Toolbar/Toolbar.js\
- WikiEditor/Modules/TemplateEditor/TemplateEditor.js
+ WikiEditor/Modules/TemplateEditor/TemplateEditor.js\
WikiEditor/Modules/AddMediaWizard/AddMediaWizard.js
VECTOR_MODULES := \
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-05-01 20:27:26 UTC (rev 65762)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-05-01 21:14:16 UTC (rev 65763)
@@ -72,7 +72,7 @@
array( 'src' =
'js/plugins/jquery.delayedBind.js', 'version' = 1 ),
array( 'src' =
'js/plugins/jquery.suggestions.js', 'version' = 11 ),
array( 'src' =
'js/plugins/jquery.textSelection.js', 'version' = 30 ),
- array( 'src' =
'js/plugins/jquery.wikiEditor.js', 'version' = 183 ),
+ array( 'src' =
'js/plugins/jquery.wikiEditor.js', 'version' = 184 ),
array( 'src' =
'js/plugins/jquery.wikiEditor.highlight.js', 'version' = 52 ),
array( 'src' =
'js/plugins/jquery.wikiEditor.toolbar.js', 'version' = 59 ),
array( 'src' =
'js/plugins/jquery.wikiEditor.dialogs.js', 'version' = 24 ),
@@ -82,10 +82,10 @@
array( 'src' =
'js/plugins/jquery.wikiEditor.publish.js', 'version' = 5 ),
),
'combined' = array(
- array( 'src' = 'js/plugins.combined.js',
'version' = 387 ),
+ array( 'src' = 'js/plugins.combined.js',
'version' = 388 ),
),
'minified' = array(
- array( 'src' = 'js/plugins.combined.min.js',
'version' = 387 ),
+ array( 'src' = 'js/plugins.combined.min.js',
'version' = 388 ),
),
),
);
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.js
===
---
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.js
2010-05-01 20:27:26 UTC (rev 65762)
+++
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/AddMediaWizard/AddMediaWizard.js
2010-05-01 21:14:16 UTC (rev 65763)
@@ -1,11 +1,10 @@
-
/* JavaScript for AddMediaWizard gadget */
-if ( wgWikiEditorEnabledModules.addMediaWizard ) {
- if( typeof mwAddMediaConfig == 'undefined'){
+if ( wgWikiEditorEnabledModules.addMediaWizard ) {
+ if( typeof mwAddMediaConfig == 'undefined' ) {
mwAddMediaConfig = {};
[MediaWiki-CVS] SVN: [65764] trunk/phase3/includes/DefaultSettings.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65764
Revision: 65764
Author: catrope
Date: 2010-05-01 21:17:44 + (Sat, 01 May 2010)
Log Message:
---
Rephrase potentially confusing comment in r6
Modified Paths:
--
trunk/phase3/includes/DefaultSettings.php
Modified: trunk/phase3/includes/DefaultSettings.php
===
--- trunk/phase3/includes/DefaultSettings.php 2010-05-01 21:14:16 UTC (rev
65763)
+++ trunk/phase3/includes/DefaultSettings.php 2010-05-01 21:17:44 UTC (rev
65764)
@@ -145,7 +145,7 @@
* asset paths as seen by users
*/
$wgStylePath = false; /// defaults to {$wgScriptPath}/skins
-$wgLocalStylePath = false; /// defaults to the same value as $wgStylePath,
and shouldn't point to an external domain
+$wgLocalStylePath = false; /// defaults to {$wgScriptPath}/skins,
shouldn't point to an external domain
$wgExtensionAssetsPath = false; /// defaults to {$wgScriptPath}/extensions
/**
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65765] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65765 Revision: 65765 Author: catrope Date: 2010-05-01 21:26:30 + (Sat, 01 May 2010) Log Message: --- Followup to r65590: we don't need to explain the meanings of 'true' and 'false' for cases like these where a dictionary will suffice. Fix another typo in the RELEASE-NOTES entry as well, and bump $wgStyleVersion for r65591. Modified Paths: -- trunk/phase3/RELEASE-NOTES trunk/phase3/includes/DefaultSettings.php Modified: trunk/phase3/RELEASE-NOTES === --- trunk/phase3/RELEASE-NOTES 2010-05-01 21:17:44 UTC (rev 65764) +++ trunk/phase3/RELEASE-NOTES 2010-05-01 21:26:30 UTC (rev 65765) @@ -62,7 +62,7 @@ * ajaxwatch now uses the API and JQuery, and can be used to animate arbitrary watch links, not just to watch the page the link is on. * (bug 20193) Added $wgVectorShowVariantName global configuration variable - which causes Vector to render the the variants drop-down menu with a label + which causes Vector to render the variants drop-down menu with a label showing the current variant name. This is off by default, pending further research into its user experience implications. Modified: trunk/phase3/includes/DefaultSettings.php === --- trunk/phase3/includes/DefaultSettings.php 2010-05-01 21:17:44 UTC (rev 65764) +++ trunk/phase3/includes/DefaultSettings.php 2010-05-01 21:26:30 UTC (rev 65765) @@ -1683,7 +1683,7 @@ * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '274'; +$wgStyleVersion = '275'; # Server-side caching: @@ -4204,8 +4204,6 @@ /** * Show the name of the current variant as a label in the variants drop-down menu - * true = Show the label - * false = Do not show the label */ $wgVectorShowVariantName = false; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65766] trunk/extensions/Storyboard/specials/Story/Story_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65766
Revision: 65766
Author: jeroendedauw
Date: 2010-05-01 21:48:27 + (Sat, 01 May 2010)
Log Message:
---
Added fallback for when there is no or an invalid lang code stored in the db
Modified Paths:
--
trunk/extensions/Storyboard/specials/Story/Story_body.php
Modified: trunk/extensions/Storyboard/specials/Story/Story_body.php
===
--- trunk/extensions/Storyboard/specials/Story/Story_body.php 2010-05-01
21:26:30 UTC (rev 65765)
+++ trunk/extensions/Storyboard/specials/Story/Story_body.php 2010-05-01
21:48:27 UTC (rev 65766)
@@ -185,7 +185,7 @@
* @param $story
*/
private function showStoryForm( $story ) {
- global $wgOut, $wgLang, $wgRequest, $wgUser, $wgJsMimeType,
$wgScriptPath;
+ global $wgOut, $wgLang, $wgRequest, $wgUser, $wgJsMimeType,
$wgScriptPath, $wgContLanguageCode;
global $egStoryboardScriptPath, $egStorysubmissionWidth,
$egStoryboardMaxStoryLen, $egStoryboardMinStoryLen;
$wgOut-setPageTitle( $story-story_title );
@@ -225,9 +225,12 @@
'/td/tr';
$languages = Language::getLanguageNames( false );
+
+ $currentLang = array_key_exists( $story-story_lang_code,
$languages ) ? $story-story_lang_code : $wgContLanguageCode;
+
+ $options = array();
ksort( $languages );
-
- $options = array();
+
foreach ( $languages as $code = $name ) {
$display = wfBCP47( $code ) . ' - ' . $name;
$options[$display] = $code;
@@ -241,7 +244,7 @@
$formBody .= 'tr' .
Html::element( 'td', array( 'width' = '100%' ), wfMsg(
'storyboard-language' ) ) .
'td' .
- $languageSelector-getInputHTML(
$story-story_lang_code ) .
+ $languageSelector-getInputHTML( $currentLang ) .
'/td/tr';
$formBody .= 'tr' .
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65767] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65767
Revision: 65767
Author: jeroendedauw
Date: 2010-05-01 22:12:10 + (Sat, 01 May 2010)
Log Message:
---
Stylized js a bit
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiQueryStories.php
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php
===
--- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-01 21:48:27 UTC
(rev 65766)
+++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-01 22:12:10 UTC
(rev 65767)
@@ -85,7 +85,6 @@
(story_modified = $storyId AND story_id =
$storyModified)
);
*/
-
}
$stories = $this-select( __METHOD__ );
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
21:48:27 UTC (rev 65766)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:12:10 UTC (rev 65767)
@@ -30,29 +30,33 @@
},
opt
);
- return this.each(function(){
- var ele=this;
- var $me=jQuery(this);
+ return this.each( function() {
+ var ele = this;
+ var $me = jQuery( this );
var $sp;
var fnEnd,fnScroll;
- var offset=0;
- var lsp=-1;_css();
+ var offset= 0 ;
+ var lsp = -1;
- opt.boxTemplate=(opt.boxTemplate||span
class='+opt.boxClass+'nbsp/span);
+ _css();
- opt.batchTemplate=(opt.batchTemplate||span/span);
- $sp=jQuery(div/div).addClass(opt.scrollPaneClass);
- $me.append($sp);
- offset=batch($sp,offset,opt);
+ opt.boxTemplate = ( opt.boxTemplate || span class='
+ opt.boxClass + 'nbsp/span );
+ opt.batchTemplate = ( opt.batchTemplate ||
span/span );
+
+ $sp = jQuery( div/div ).addClass(
opt.scrollPaneClass );
+ $me.append( $sp );
+ offset = batch( $sp, offset, opt );
$me.scrollTop(0).scrollLeft(0);
+
_ab();
- fnEnd=vEnd;
- fnScroll=vScroll;
- setTimeout(monEnd,opt.endDelay);
+ fnEnd = vEnd;
+ fnScroll = vScroll;
- if(typeof opt.updateBatch=='function'){
- setTimeout(monScroll,opt.scrollDelay);
+ setTimeout( monEnd, opt.endDelay );
+
+ if( typeof opt.updateBatch == 'function' ){
+ setTimeout( monScroll, opt.scrollDelay );
}
function _css(){
@@ -78,29 +82,39 @@
}
}
- function batch($s,o,opt){
- var $b,i,rp=opt.batchNum;
+ function batch($s, offset ,opt){
+ var $b;
+ var i;
+ var rp = opt.batchNum;
- while(rp--){
-
$b=jQuery(opt.batchTemplate).attr({offset:o,len:opt.batchSize}).addClass(opt.batchClass+
+opt.emptyBatchClass);
- i=opt.batchSize;
- while(i--opt.maxOffseto++){
- $b.append(opt.boxTemplate);
+ while( rp-- ) {
+ $b=jQuery(opt.batchTemplate)
+ .attr({
+ offset:offset,
+ len:opt.batchSiz
+ })
+ .addClass( opt.batchClass +
+ opt.emptyBatchClass );
+
+ i =
[MediaWiki-CVS] SVN: [65768] trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65768
Revision: 65768
Author: jeroendedauw
Date: 2010-05-01 22:22:23 + (Sat, 01 May 2010)
Log Message:
---
Follow up to r65767
Modified Paths:
--
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:12:10 UTC (rev 65767)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:22:23 UTC (rev 65768)
@@ -34,8 +34,9 @@
var ele = this;
var $me = jQuery( this );
var $sp;
- var fnEnd,fnScroll;
- var offset= 0 ;
+ var fnEnd;
+ var fnScroll;
+ var offset = 0;
var lsp = -1;
_css();
@@ -69,26 +70,26 @@
os=$me.find('.batch:first').next().offset().top;
b=($me.height()/os+1)*os;
- if(auto==opt.uBound){
- opt.uBound=b;
+ if ( auto == opt.uBound ) {
+ opt.uBound = b;
}
- if(auto==opt.lBound){
- opt.lBound=-b;
+ if ( auto == opt.lBound ) {
+ opt.lBound = -b;
}
- if(auto==opt.eBound){
- opt.eBound=b*2;
+ if ( auto == opt.eBound ) {
+ opt.eBound = b * 2;
}
}
- function batch($s, offset ,opt){
+ function batch( $s, offset, opt ) {
var $b;
var i;
var rp = opt.batchNum;
while( rp-- ) {
- $b=jQuery(opt.batchTemplate)
+ $b=jQuery( opt.batchTemplate )
.attr({
offset:offset,
len:opt.batchSiz
@@ -107,18 +108,18 @@
return offset;
};
- function vScroll(){
+ function vScroll() {
var so = $me.scrollTop();
if( lsp != so){
lsp = so;
var co = $me.offset().top;
- $sp.find( ' .' + opt.emptyBatchClass
).each(function( i, obj ){
- var $b=jQuery(obj);
- var p=$b.position().top-co;
-
if(opt.lBoundp||popt.uBound){return;}
-
opt.updateBatch($b.removeClass(opt.emptyBatchClass));
+ $sp.find( ' .' + opt.emptyBatchClass
).each( function( i, obj ) {
+ var $b = jQuery( obj );
+ var p = $b.position().top - co;
+ if ( opt.lBound p || p
opt.uBound ) { return; }
+ opt.updateBatch(
$b.removeClass( opt.emptyBatchClass ) );
});
}
};
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65769] trunk/extensions/Storyboard/storyboard.css
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65769
Revision: 65769
Author: jeroendedauw
Date: 2010-05-01 22:27:21 + (Sat, 01 May 2010)
Log Message:
---
Fixed css issue
Modified Paths:
--
trunk/extensions/Storyboard/storyboard.css
Modified: trunk/extensions/Storyboard/storyboard.css
===
--- trunk/extensions/Storyboard/storyboard.css 2010-05-01 22:22:23 UTC (rev
65768)
+++ trunk/extensions/Storyboard/storyboard.css 2010-05-01 22:27:21 UTC (rev
65769)
@@ -32,8 +32,11 @@
float: right;
}
-.story-metadata div {
+.story-metadata {
margin: 5px 15px 5px 15px;
+}
+
+div.story-metadata {
overflow: hidden;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65770] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65770
Revision: 65770
Author: jeroendedauw
Date: 2010-05-01 22:37:18 + (Sat, 01 May 2010)
Log Message:
---
Added storymodified and storyid attributes to the batch html for the continue
parameter
Modified Paths:
--
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:27:21 UTC (rev 65769)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:37:18 UTC (rev 65770)
@@ -61,15 +61,16 @@
}
function _css(){
-
$me.css({overflow-x:hidden,overflow-y:auto});
+ $me.css( {
+ overflow-x: hidden,
+ overflow-y: auto
+ } );
}
function _ab(){
- var os,b;
+ var os = $me.find( '.batch:first'
).next().offset().top;
+ var b = ( $me.height() / os + 1 ) * os;
- os=$me.find('.batch:first').next().offset().top;
- b=($me.height()/os+1)*os;
-
if ( auto == opt.uBound ) {
opt.uBound = b;
}
@@ -91,8 +92,10 @@
while( rp-- ) {
$b=jQuery( opt.batchTemplate )
.attr({
- offset:offset,
- len:opt.batchSiz
+ offset: offset,
+ len: opt.batchSiz,
+ storymodified: 0,
+ storyid: 0
})
.addClass( opt.batchClass +
+ opt.emptyBatchClass );
@@ -124,9 +127,9 @@
}
};
- function vEnd(){
- if(ele.scrollTop 0
ele.scrollHeight-ele.scrollTop opt.eBound){
- offset=batch($sp,offset,opt);
+ function vEnd() {
+ if( ele.scrollTop 0
ele.scrollHeight-ele.scrollTop opt.eBound ) {
+ offset = batch( $sp, offset, opt );
return 1;
}
Modified: trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
===
--- trunk/extensions/Storyboard/tags/Storyboard/storyboard.js 2010-05-01
22:27:21 UTC (rev 65769)
+++ trunk/extensions/Storyboard/tags/Storyboard/storyboard.js 2010-05-01
22:37:18 UTC (rev 65770)
@@ -23,11 +23,11 @@
$.getJSON( wgScriptPath + '/api.php',
{
'action': 'query',
- 'list': 'stories',
- 'stcontinue': $storyboard.attr( 'offset' ) +
'-0', // TODO: get modification date and id of the last story
- 'stlimit': 4,
- 'stlanguage': window.storyboardLanguage,
- 'format': 'json'
+ 'list': 'stories',
+ 'format': 'json',
+ 'stcontinue': $storyboard.attr( 'storymodified'
) + '-' + $storyboard.attr( 'storyid' ),
+ 'stlimit': 8,
+ 'stlanguage': window.storyboardLanguage
},
function( data ) {
if ( data.query ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65771] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65771
Revision: 65771
Author: jeroendedauw
Date: 2010-05-01 23:28:26 + (Sat, 01 May 2010)
Log Message:
---
Refactoring ajaxscroll JS
Modified Paths:
--
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
22:37:18 UTC (rev 65770)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
23:28:26 UTC (rev 65771)
@@ -8,34 +8,35 @@
* @version 0.2
*/
(function($) {
- $.fn.ajaxScroll=function(opt){
- opt=jQuery.extend(
+ $.fn.ajaxScroll = function( opt ) {
+ opt = jQuery.extend(
{
- batchNum:5,
- batchSize:30,
- batchTemplate:null,
- boxTemplate:null,
- batchClass:storyboard-batch,
- boxClass:storyboard-box,
- emptyBatchClass:storyboard-empty,
- scrollPaneClass:scrollpane,
- lBound:auto,
- uBound:auto,
- eBound:auto,
- maxOffset:1000,
- scrollDelay:600,
- endDelay:100,
- updateBatch:null,
- updateEnd:null
+ batchNum: 5,
+ batchSize: 30,
+ batchTemplate: null,
+ boxTemplate: null,
+ batchClass: storyboard-batch,
+ boxClass: storyboard-box,
+ emptyBatchClass: storyboard-empty,
+ scrollPaneClass: scrollpane,
+ lBound: auto,
+ uBound: auto,
+ eBound: auto,
+ maxOffset: 1000,
+ scrollDelay: 600, // The interval for checking
if the user scrolled, in ms.
+ endDelay: 100,
+ updateBatch: null,
+ updateEnd: null,
+ busy: false
},
opt
);
+
return this.each( function() {
var ele = this;
var $me = jQuery( this );
var $sp;
var fnEnd;
- var fnScroll;
var offset = 0;
var lsp = -1;
@@ -52,12 +53,11 @@
_ab();
fnEnd = vEnd;
- fnScroll = vScroll;
setTimeout( monEnd, opt.endDelay );
if( typeof opt.updateBatch == 'function' ){
- setTimeout( monScroll, opt.scrollDelay );
+ setTimeout( handleScrolling, opt.scrollDelay );
}
function _css(){
@@ -105,30 +105,40 @@
$b.append( opt.boxTemplate );
}
- $s.append($b);
+ $s.append( $b );
}
return offset;
};
function vScroll() {
+ // If a batcnh is currently being loaded, we
can't start another one yet.
+ if ( opt.busy ) {
+ return;
+ }
+
var so = $me.scrollTop();
- if( lsp != so){
+ if( lsp != so) {
lsp = so;
var co = $me.offset().top;
$sp.find( ' .' + opt.emptyBatchClass
).each( function( i, obj ) {
var $b = jQuery( obj );
[MediaWiki-CVS] SVN: [65772] trunk/extensions/LdapAuthentication/LdapAuthentication.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65772
Revision: 65772
Author: reedy
Date: 2010-05-01 23:51:45 + (Sat, 01 May 2010)
Log Message:
---
issing - missing
Modified Paths:
--
trunk/extensions/LdapAuthentication/LdapAuthentication.php
Modified: trunk/extensions/LdapAuthentication/LdapAuthentication.php
===
--- trunk/extensions/LdapAuthentication/LdapAuthentication.php 2010-05-01
23:28:26 UTC (rev 65771)
+++ trunk/extensions/LdapAuthentication/LdapAuthentication.php 2010-05-01
23:51:45 UTC (rev 65772)
@@ -166,7 +166,7 @@
$this-printDebug( Entering Connect, NONSENSITIVE );
if ( !function_exists( 'ldap_connect' ) ) {
- $this-printDebug( It looks like you are issing LDAP
support; please ensure you have either compiled LDAP support in, or have
enabled the module. If the authentication is working for you, the plugin isn't
properly detecting the LDAP module, and you can safely ignore this message.,
NONSENSITIVE );
+ $this-printDebug( It looks like you are missing LDAP
support; please ensure you have either compiled LDAP support in, or have
enabled the module. If the authentication is working for you, the plugin isn't
properly detecting the LDAP module, and you can safely ignore this message.,
NONSENSITIVE );
return false;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65773] trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65773
Revision: 65773
Author: jeroendedauw
Date: 2010-05-02 00:13:10 + (Sun, 02 May 2010)
Log Message:
---
Refactoring ajaxscroll JS
Modified Paths:
--
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-01
23:51:45 UTC (rev 65772)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-02
00:13:10 UTC (rev 65773)
@@ -36,11 +36,13 @@
var ele = this;
var $me = jQuery( this );
var $sp;
- var fnEnd;
var offset = 0;
var lsp = -1;
- _css();
+ $me.css( {
+ overflow-x: hidden,
+ overflow-y: auto
+ } );
opt.boxTemplate = ( opt.boxTemplate || span class='
+ opt.boxClass + 'nbsp/span );
opt.batchTemplate = ( opt.batchTemplate ||
span/span );
@@ -50,40 +52,27 @@
offset = batch( $sp, offset, opt );
$me.scrollTop(0).scrollLeft(0);
- _ab();
+ var os = $me.find( '.batch:first' ).next().offset().top;
+ var b = ( $me.height() / os + 1 ) * os;
- fnEnd = vEnd;
+ if ( auto == opt.uBound ) {
+ opt.uBound = b;
+ }
+ if ( auto == opt.lBound ) {
+ opt.lBound = -b;
+ }
+
+ if ( auto == opt.eBound ) {
+ opt.eBound = b * 2;
+ }
+
setTimeout( monEnd, opt.endDelay );
if( typeof opt.updateBatch == 'function' ){
setTimeout( handleScrolling, opt.scrollDelay );
}
- function _css(){
- $me.css( {
- overflow-x: hidden,
- overflow-y: auto
- } );
- }
-
- function _ab(){
- var os = $me.find( '.batch:first'
).next().offset().top;
- var b = ( $me.height() / os + 1 ) * os;
-
- if ( auto == opt.uBound ) {
- opt.uBound = b;
- }
-
- if ( auto == opt.lBound ) {
- opt.lBound = -b;
- }
-
- if ( auto == opt.eBound ) {
- opt.eBound = b * 2;
- }
- }
-
function batch( $s, offset, opt ) {
var $b;
var i;
@@ -111,12 +100,12 @@
return offset;
};
- function vScroll() {
- // If a batcnh is currently being loaded, we
can't start another one yet.
- if ( opt.busy ) {
- return;
- }
-
+ /**
+* This function emulates a scroll event handler by
firing itself every so many ms.
+* It checks if the user has scrolled down far enough,
and calls the update batch
+* function if this is the case.
+*/
+ function handleScrolling() {
var so = $me.scrollTop();
if( lsp != so) {
@@ -129,13 +118,20 @@
if ( opt.lBound p || p
opt.uBound ) {
return;
- }
+ }
[MediaWiki-CVS] SVN: [65774] trunk/phase3/skins/common/wikibits.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65774
Revision: 65774
Author: simetrical
Date: 2010-05-02 01:59:08 + (Sun, 02 May 2010)
Log Message:
---
Improve IE6 version check to avoid false positives
Bug 23171. Not added to RELEASE-NOTES because I'll backport to 1.16.
Modified Paths:
--
trunk/phase3/skins/common/wikibits.js
Modified: trunk/phase3/skins/common/wikibits.js
===
--- trunk/phase3/skins/common/wikibits.js 2010-05-02 00:13:10 UTC (rev
65773)
+++ trunk/phase3/skins/common/wikibits.js 2010-05-02 01:59:08 UTC (rev
65774)
@@ -25,8 +25,14 @@
var opera7_bugs = is_opera_seven !is_opera_95;
var opera95_bugs = /opera\/(9\.5)/.test( clientPC );
}
-// Start at 4 to minimize the chance of breaking on IE10 :)
-var ie6_bugs = /msie [4-6]/.test( clientPC );
+// As recommended by http://msdn.microsoft.com/en-us/library/ms537509.aspx,
+// avoiding false positives from moronic extensions that append to the IE UA
+// string (bug 23171)
+var ie6_bugs = false;
+if ( /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null
+ parseFloat( RegExp.$1 ) = 6.0 ) {
+ ie6_bugs = true;
+}
// Global external objects used by this script.
/*extern ta, stylepath, skin */
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65775] branches/REL1_16/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65775
Revision: 65775
Author: simetrical
Date: 2010-05-02 02:00:21 + (Sun, 02 May 2010)
Log Message:
---
Backport r65774 Improve IE6 version check to avoid false positives
Backported as a regression from 1.15 due to r60994. Original commit
message:
Bug 23171. Not added to RELEASE-NOTES because I'll backport to 1.16.
Modified Paths:
--
branches/REL1_16/phase3/RELEASE-NOTES
branches/REL1_16/phase3/skins/common/wikibits.js
Modified: branches/REL1_16/phase3/RELEASE-NOTES
===
--- branches/REL1_16/phase3/RELEASE-NOTES 2010-05-02 01:59:08 UTC (rev
65774)
+++ branches/REL1_16/phase3/RELEASE-NOTES 2010-05-02 02:00:21 UTC (rev
65775)
@@ -63,6 +63,7 @@
check.
* (bug 23167) Check the watch checkbox by default if the watchcreations
preference is set.
+* (bug 23171) Improve IE6 version check to avoid false positives.
=== Changes since 1.16 beta 1 ===
Modified: branches/REL1_16/phase3/skins/common/wikibits.js
===
--- branches/REL1_16/phase3/skins/common/wikibits.js2010-05-02 01:59:08 UTC
(rev 65774)
+++ branches/REL1_16/phase3/skins/common/wikibits.js2010-05-02 02:00:21 UTC
(rev 65775)
@@ -25,8 +25,14 @@
var opera7_bugs = is_opera_seven !is_opera_95;
var opera95_bugs = /opera\/(9\.5)/.test( clientPC );
}
-// Start at 4 to minimize the chance of breaking on IE10 :)
-var ie6_bugs = /msie [4-6]/.test( clientPC );
+// As recommended by http://msdn.microsoft.com/en-us/library/ms537509.aspx,
+// avoiding false positives from moronic extensions that append to the IE UA
+// string (bug 23171)
+var ie6_bugs = false;
+if ( /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null
+ parseFloat( RegExp.$1 ) = 6.0 ) {
+ ie6_bugs = true;
+}
// Global external objects used by this script.
/*extern ta, stylepath, skin */
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65776] trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions. js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65776
Revision: 65776
Author: jeroendedauw
Date: 2010-05-02 02:06:09 + (Sun, 02 May 2010)
Log Message:
---
Applied solution of AlHooton for correct marker sizes
Modified Paths:
--
trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
Modified: trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
===
--- trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
2010-05-02 02:00:21 UTC (rev 65775)
+++ trunk/extensions/Maps/Services/GoogleMaps/GoogleMapFunctions.js
2010-05-02 02:06:09 UTC (rev 65776)
@@ -21,18 +21,32 @@
* Returns GMarker object on the provided location. It will show a popup baloon
* with title and label when clicked, if either of these is set.
*/
-function createGMarker(point, title, label, icon) {
+function createGMarker( point, title, label, icon ) {
var marker;
- if (icon != '') {
- var iconObj = new GIcon(G_DEFAULT_ICON);
+ if ( icon != '' ) {
+ var iconObj = new GIcon( G_DEFAULT_ICON );
iconObj.image = icon;
- marker = new GMarker(point, {icon:iconObj});
+
+ /* Determine size of icon and pass it in */
+ var newimg = new Image();
+ newimg.src = icon;
+ iconObj.iconSize.width = newimg.width;
+ iconObj.iconSize.height = newimg.height;
+ iconObj.shadow = null;
+
+ /* Anchor the icon on center */
+ var anchor = new GPoint();
+ anchor.x = Math.floor( newimg.width / 2 );
+ anchor.y = Math.floor( newimg.height / 2 );
+ iconObj.iconAnchor = anchor;
+
+ marker = new GMarker( point, { icon:iconObj } );
} else {
- marker = new GMarker(point);
+ marker = new GMarker( point );
}
- if ((title + label).length 0) {
+ if ( ( title + label ).length 0 ) {
var bothTxtAreSet = title.length 0 label.length 0;
var popupText = bothTxtAreSet ? 'b' + title + '/bhr /' +
label : title + label;
popupText = 'div style=overflow:auto;max-height:140px;' +
popupText + '/div';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65777] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65777
Revision: 65777
Author: jeroendedauw
Date: 2010-05-02 03:46:18 + (Sun, 02 May 2010)
Log Message:
---
Finished work to make the storyboard work with modification date and id
continue parameters
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiQueryStories.php
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php
===
--- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 02:06:09 UTC
(rev 65776)
+++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 03:46:18 UTC
(rev 65777)
@@ -101,7 +101,10 @@
'id' = $story-story_id,
'author' = $story-story_author_name,
'title' = $story-story_title,
- 'created' = wfTimestamp( TS_ISO_8601,
$story-story_created ),
+ //'created' = wfTimestamp( TS_ISO_8601,
$story-story_created ),
+ //'modified' = wfTimestamp( TS_ISO_8601,
$story-story_modified ),
+ 'created' = $story-story_created,
+ 'modified' = $story-story_modified,
'imageurl' = $story-story_author_image,
'permalink' = SpecialPage::getTitleFor(
'story', $story-story_title )-getFullURL()
);
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-02
02:06:09 UTC (rev 65776)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-02
03:46:18 UTC (rev 65777)
@@ -26,8 +26,7 @@
scrollDelay: 600, // The interval for checking
if the user scrolled, in ms.
endDelay: 100,
updateBatch: null,
- updateEnd: null,
- busy: false
+ updateEnd: null
},
opt
);
@@ -69,6 +68,7 @@
setTimeout( monEnd, opt.endDelay );
+ // Initiate the scroll handling.
if( typeof opt.updateBatch == 'function' ){
setTimeout( handleScrolling, opt.scrollDelay );
}
@@ -79,12 +79,12 @@
var rp = opt.batchNum;
while( rp-- ) {
- $b=jQuery( opt.batchTemplate )
+ $b = jQuery( opt.batchTemplate )
.attr({
offset: offset,
- len: opt.batchSiz,
- storymodified: 0,
- storyid: 0
+ storymodified:
window.storyModified,
+ storyid:
window.storyId,
+ len: opt.batchSize
})
.addClass( opt.batchClass +
+ opt.emptyBatchClass );
@@ -108,7 +108,7 @@
function handleScrolling() {
var so = $me.scrollTop();
- if( lsp != so) {
+ if( !window.storyboardBusy lsp != so ) {
lsp = so;
var co = $me.offset().top;
@@ -120,7 +120,8 @@
return;
}
- opt.updateBatch(
$b.removeClass( opt.emptyBatchClass ), opt );
+ window.storyboardBusy = true;
+ opt.updateBatch(
$b.removeClass( opt.emptyBatchClass ) );
});
}
[MediaWiki-CVS] SVN: [65778] trunk/extensions/Storyboard
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65778
Revision: 65778
Author: jeroendedauw
Date: 2010-05-02 03:57:27 + (Sun, 02 May 2010)
Log Message:
---
Follow up to r65777
Modified Paths:
--
trunk/extensions/Storyboard/api/ApiQueryStories.php
trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php
===
--- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 03:46:18 UTC
(rev 65777)
+++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 03:57:27 UTC
(rev 65778)
@@ -79,12 +79,10 @@
$storyModified = $continueParams[0];
$storyId = intval( $continueParams[1] );
- /* FIXME
$this-addWhere(
- story_modified $storyModified OR .
+ story_modified $storyModified OR .
(story_modified = $storyId AND story_id =
$storyModified)
);
- */
}
$stories = $this-select( __METHOD__ );
Modified: trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js
===
--- trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-02
03:46:18 UTC (rev 65777)
+++ trunk/extensions/Storyboard/jquery/jquery.ajaxscroll.js 2010-05-02
03:57:27 UTC (rev 65778)
@@ -36,7 +36,7 @@
var $me = jQuery( this );
var $sp;
var offset = 0;
- var lsp = -1;
+ var previousScrollPos = -1;
$me.css( {
overflow-x: hidden,
@@ -106,22 +106,22 @@
* function if this is the case.
*/
function handleScrolling() {
- var so = $me.scrollTop();
+ var scrollPos = $me.scrollTop();
- if( !window.storyboardBusy lsp != so ) {
- lsp = so;
+ if( !window.storyboardBusy previousScrollPos
!= scrollPos ) {
+ previousScrollPos = scrollPos;
var co = $me.offset().top;
$sp.find( ' .' + opt.emptyBatchClass
).each( function( i, obj ) {
- var $b = jQuery( obj );
- var p = $b.position().top - co;
+ var $batchDiv = jQuery( obj );
+ var p =
$batchDiv.position().top - co;
if ( opt.lBound p || p
opt.uBound ) {
return;
}
window.storyboardBusy = true;
- opt.updateBatch(
$b.removeClass( opt.emptyBatchClass ) );
+ opt.updateBatch(
$batchDiv.removeClass( opt.emptyBatchClass ) );
});
}
Modified: trunk/extensions/Storyboard/tags/Storyboard/storyboard.js
===
--- trunk/extensions/Storyboard/tags/Storyboard/storyboard.js 2010-05-02
03:46:18 UTC (rev 65777)
+++ trunk/extensions/Storyboard/tags/Storyboard/storyboard.js 2010-05-02
03:57:27 UTC (rev 65778)
@@ -10,7 +10,7 @@
$( '.storyboard' ).ajaxScroll( {
updateBatch: updateStoryboard,
maxOffset: 500,
- batchSize: 8,
+ batchSize: 2,
batchNum: 2, // TODO: change to 1. Some issue in the
ajaxscroll plugin makesit break when this is the case though.
batchClass: batch,
boxClass: storyboard-box,
@@ -24,7 +24,7 @@
'action': 'query',
'list': 'stories',
'format': 'json',
- 'stlimit': 8,
+ 'stlimit': 2,
'stlanguage': window.storyboardLanguage
};
[MediaWiki-CVS] SVN: [65779] trunk/extensions/Storyboard/api/ApiQueryStories.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65779 Revision: 65779 Author: jeroendedauw Date: 2010-05-02 03:58:10 + (Sun, 02 May 2010) Log Message: --- Added fixme Modified Paths: -- trunk/extensions/Storyboard/api/ApiQueryStories.php Modified: trunk/extensions/Storyboard/api/ApiQueryStories.php === --- trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 03:57:27 UTC (rev 65778) +++ trunk/extensions/Storyboard/api/ApiQueryStories.php 2010-05-02 03:58:10 UTC (rev 65779) @@ -110,6 +110,7 @@ $this-getResult()-addValue( array( 'query', $this-getModuleName() ), null, $res ); } + // FIXME: continue parameter is not getting passed with the result $this-getResult()-setIndexedTagName_internal( array( 'query', $this-getModuleName() ), 'story' ); } ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65780] trunk/extensions/Maps/Services/YahooMaps/YahooMapFunctions.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65780
Revision: 65780
Author: jeroendedauw
Date: 2010-05-02 04:09:12 + (Sun, 02 May 2010)
Log Message:
---
Applied solution of AlHooton for correct marker sizes to Yahoo! Maps
Modified Paths:
--
trunk/extensions/Maps/Services/YahooMaps/YahooMapFunctions.js
Modified: trunk/extensions/Maps/Services/YahooMaps/YahooMapFunctions.js
===
--- trunk/extensions/Maps/Services/YahooMaps/YahooMapFunctions.js
2010-05-02 03:58:10 UTC (rev 65779)
+++ trunk/extensions/Maps/Services/YahooMaps/YahooMapFunctions.js
2010-05-02 04:09:12 UTC (rev 65780)
@@ -15,10 +15,13 @@
function createYMarker(geoPoint, title, label, icon){
var newMarker;
- if (icon != '') {
- newMarker = new YMarker(geoPoint, new YImage(icon));
+ if ( icon != '' ) {
+ /* Determine size of icon and pass it in */
+ var newimg = new Image();
+ newimg.src = icon;
+ newMarker = new YMarker( geoPoint, new YImage( icon, new
YSize( newimg.width, newimg.height ) ) );
} else {
- newMarker = new YMarker(geoPoint);
+ newMarker = new YMarker( geoPoint );
}
if ((title + label).length 0) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65781] trunk/extensions/Validator
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65781
Revision: 65781
Author: jeroendedauw
Date: 2010-05-02 04:34:01 + (Sun, 02 May 2010)
Log Message:
---
Follow up to r65670
Modified Paths:
--
trunk/extensions/Validator/Validator.class.php
trunk/extensions/Validator/Validator_Functions.php
Modified: trunk/extensions/Validator/Validator.class.php
===
--- trunk/extensions/Validator/Validator.class.php 2010-05-02 04:09:12 UTC
(rev 65780)
+++ trunk/extensions/Validator/Validator.class.php 2010-05-02 04:34:01 UTC
(rev 65781)
@@ -69,8 +69,8 @@
private static $mValidationFunctions = array(
'in_array' = array( 'ValidatorFunctions', 'in_array' ),
'in_range' = array( 'ValidatorFunctions', 'in_range' ),
- 'is_numeric' = 'is_numeric',
- 'is_float' = 'is_float',
+ 'is_numeric' = array( 'ValidatorFunctions', 'is_numeric' ),
+ 'is_float' = array( 'ValidatorFunctions', 'is_float' ),
'is_integer' = array( 'ValidatorFunctions', 'is_integer' ),
'not_empty' = array( 'ValidatorFunctions', 'not_empty' ),
'has_length' = array( 'ValidatorFunctions', 'has_length' ),
Modified: trunk/extensions/Validator/Validator_Functions.php
===
--- trunk/extensions/Validator/Validator_Functions.php 2010-05-02 04:09:12 UTC
(rev 65780)
+++ trunk/extensions/Validator/Validator_Functions.php 2010-05-02 04:34:01 UTC
(rev 65781)
@@ -26,8 +26,9 @@
* Returns whether the provided value, which must be a number, is
within a certain range. Upper bound included.
*
* @param $value
-* @param $lower
-* @param $upper
+* @param array $metaData
+* @param mixed $lower
+* @param mixed $upper
*
* @return boolean
*/
@@ -43,6 +44,7 @@
* Returns whether the string value is not empty. Not empty is defined
as having at least one character after trimming.
*
* @param $value
+* @param array $metaData
*
* @return boolean
*/
@@ -54,6 +56,7 @@
* Returns whether the string value is not empty. Not empty is defined
as having at least one character after trimming.
*
* @param $value
+* @param array $metaData
*
* @return boolean
*/
@@ -68,6 +71,7 @@
* Returns whether a variable is an integer or an integer string. Uses
the native PHP function.
*
* @param $value
+* @param array $metaData
*
* @return boolean
*/
@@ -79,8 +83,9 @@
* Returns whether the length of the value is within a certain range.
Upper bound included.
*
* @param string $value
-* @param $lower
-* @param $upper
+* @param array $metaData
+* @param mixed $lower
+* @param mixed $upper
*
* @return boolean
*/
@@ -92,8 +97,9 @@
* Returns whether the amount of items in the list is within a certain
range. Upper bound included.
*
* @param array $values
-* @param $lower
-* @param $upper
+* @param array $metaData
+* @param mixed $lower
+* @param mixed $upper
*
* @return boolean
*/
@@ -105,6 +111,7 @@
* Returns whether the list of values does not have any duplicates.
*
* @param array $values
+* @param array $metaData
*
* @return boolean
*/
@@ -116,6 +123,7 @@
* Returns the result of preg_match.
*
* @param string $value
+* @param array $metaData
* @param string $pattern
*
* @return boolean
@@ -123,4 +131,28 @@
public static function regex( $value, array $metaData, $pattern ) {
return (bool)preg_match( $pattern, $value );
}
+
+ /**
+* Wrapper for the native is_numeric function.
+*
+* @param $value
+* @param array $metaData
+*
+* @return boolean
+*/
+ public static function is_numeric( $value, array $metaData ) {
+ return is_numeric( $value );
+ }
+
+ /**
+* Wrapper for the native is_float function.
+*
+* @param $value
+* @param array $metaData
+*
+* @return boolean
+*/
+ public static function is_float( $value, array $metaData ) {
+ return is_float( $value );
+ }
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65782] trunk/extensions/Validator
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65782
Revision: 65782
Author: jeroendedauw
Date: 2010-05-02 04:51:27 + (Sun, 02 May 2010)
Log Message:
---
Fixed bug in float parameter type validation
Modified Paths:
--
trunk/extensions/Validator/Validator.php
trunk/extensions/Validator/Validator_Functions.php
Modified: trunk/extensions/Validator/Validator.php
===
--- trunk/extensions/Validator/Validator.php2010-05-02 04:34:01 UTC (rev
65781)
+++ trunk/extensions/Validator/Validator.php2010-05-02 04:51:27 UTC (rev
65782)
@@ -24,7 +24,7 @@
die( 'Not an entry point.' );
}
-define( 'Validator_VERSION', '0.3 a3' );
+define( 'Validator_VERSION', '0.3 a4' );
// Constants indicating the strictness of the parameter validation.
define( 'Validator_ERRORS_NONE', 0 );
Modified: trunk/extensions/Validator/Validator_Functions.php
===
--- trunk/extensions/Validator/Validator_Functions.php 2010-05-02 04:34:01 UTC
(rev 65781)
+++ trunk/extensions/Validator/Validator_Functions.php 2010-05-02 04:51:27 UTC
(rev 65782)
@@ -145,7 +145,8 @@
}
/**
-* Wrapper for the native is_float function.
+* Returns if the value is a floating point number.
+* Does NOT check the type of the variable like the native is_float
function.
*
* @param $value
* @param array $metaData
@@ -153,6 +154,6 @@
* @return boolean
*/
public static function is_float( $value, array $metaData ) {
- return is_float( $value );
+ return preg_match( '/^\d+(\.\d+)?$/', $value );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65783] trunk/extensions/Maps
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65783
Revision: 65783
Author: jeroendedauw
Date: 2010-05-02 04:52:21 + (Sun, 02 May 2010)
Log Message:
---
Cleared out issues with #finddestination function
Modified Paths:
--
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/ParserFunctions/GeoFunctions/Maps_GeoFunctions.php
Modified: trunk/extensions/Maps/Maps.php
===
--- trunk/extensions/Maps/Maps.php 2010-05-02 04:51:27 UTC (rev 65782)
+++ trunk/extensions/Maps/Maps.php 2010-05-02 04:52:21 UTC (rev 65783)
@@ -33,7 +33,7 @@
echo 'bWarning:/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.';
}
else {
- define( 'Maps_VERSION', '0.6 a18' );
+ define( 'Maps_VERSION', '0.6 a19' );
// The different coordinate notations.
define( 'Maps_COORDS_FLOAT', 'float' );
Modified:
trunk/extensions/Maps/ParserFunctions/GeoFunctions/Maps_GeoFunctions.php
===
--- trunk/extensions/Maps/ParserFunctions/GeoFunctions/Maps_GeoFunctions.php
2010-05-02 04:51:27 UTC (rev 65782)
+++ trunk/extensions/Maps/ParserFunctions/GeoFunctions/Maps_GeoFunctions.php
2010-05-02 04:52:21 UTC (rev 65783)
@@ -191,7 +191,7 @@
array( 'location', 'bearing', 'distance' )
);
$doCalculation = $parameters !== false;
-
+
if ( $doCalculation ) {
$canGeocode = MapsMapper::geocoderIsAvailable();
@@ -202,9 +202,7 @@
}
if ( $location ) {
- // var_dump($location);
$destination = self::findDestination(
$location, $parameters['bearing'], $parameters['distance'] );
- // var_dump($destination);exit;
$output =
MapsCoordinateParser::formatCoordinates( $destination, $parameters['format'],
$parameters['directional'] );
} else {
global $egValidatorFatalLevel;
@@ -278,17 +276,18 @@
* @param float $distance The distance to travel in km.
*
* @return array The desitination coordinates, as non-directional
floats in an array with lat and lon keys.
-*
-* FIXME: something here is going wrong - need to debug
*/
public static function findDestination( array $startingCoordinates,
$bearing, $distance ) {
$startingCoordinates['lat'] =
(float)$startingCoordinates['lat'];
$startingCoordinates['lon'] =
(float)$startingCoordinates['lon'];
+
$angularDistance = $distance / Maps_EARTH_RADIUS;
+
$lat = asin(
sin( $startingCoordinates['lat'] ) * cos(
$angularDistance ) +
cos( $startingCoordinates['lat'] ) * sin(
$angularDistance ) * cos( $bearing )
);
+
return array(
'lat' = $lat,
'lon' = $startingCoordinates['lon'] + atan2(
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [65784] trunk/extensions/SemanticMaps
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65784 Revision: 65784 Author: jeroendedauw Date: 2010-05-02 05:04:45 + (Sun, 02 May 2010) Log Message: --- Normalized indenting Modified Paths: -- trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php trunk/extensions/SemanticMaps/SemanticMaps.php Modified: trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php === --- trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php 2010-05-02 04:52:21 UTC (rev 65783) +++ trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_QueryPrinters.php 2010-05-02 05:04:45 UTC (rev 65784) @@ -62,72 +62,72 @@ 'geoservice' = array( 'criteria' = array( 'in_array' = $egMapsAvailableGeoServices - ), + ), 'default' = $egMapsDefaultGeoService - ), + ), 'format' = array( 'required' = true, 'default' = $egMapsDefaultServices['qp'] - ), + ), 'centre' = array( 'aliases' = array( 'center' ), - ), + ), 'forceshow' = array( 'type' = 'boolean', 'aliases' = array( 'force show' ), 'default' = $smgQPForceShow, 'output-type' = 'boolean' - ), + ), 'template' = array( 'criteria' = array( 'not_empty' = array() - ), + ), 'default' = $smgQPTemplate, - ), + ), 'showtitle' = array( 'type' = 'boolean', 'aliases' = array( 'show title' ), 'default' = $smgQPShowTitle, 'output-type' = 'boolean' - ), + ), 'icon' = array( 'criteria' = array( 'not_empty' = array() - ) - ), + ) + ), // SMW #Ask: parameters 'limit' = array( 'type' = 'integer', 'criteria' = array( 'in_range' = array( 0 ) - ) - ), + ) + ), 'offset' = array( 'type' = 'integer' - ), + ), 'sort' = array(), 'order' = array( 'criteria' = array( 'in_array' = array( 'ascending', 'asc', 'descending', 'desc', 'reverse' ) - ) - ), + ) + ), 'headers' = array( 'criteria' = array( 'in_array' = array( 'show', 'hide' ) - ) - ), + ) + ), 'mainlabel' = array(), 'link' = array( 'criteria' = array( 'in_array' = array( 'none', 'subject', 'all' ) - ) - ), + ) + ), 'default' = array(), 'intro' = array(), 'outro' = array(), 'searchlabel' = array(), 'distance' = array(), - ); + ); } /** Modified: trunk/extensions/SemanticMaps/SemanticMaps.php === --- trunk/extensions/SemanticMaps/SemanticMaps.php
[MediaWiki-CVS] SVN: [65785] trunk/extensions/SemanticMediaWiki/includes/storage/ SMW_SQLStore2_Queries.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65785
Revision: 65785
Author: jeroendedauw
Date: 2010-05-02 05:47:03 + (Sun, 02 May 2010)
Log Message:
---
Removed commented distance query code
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2_Queries.php
Modified:
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2_Queries.php
===
---
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2_Queries.php
2010-05-02 05:04:45 UTC (rev 65784)
+++
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2_Queries.php
2010-05-02 05:47:03 UTC (rev 65785)
@@ -66,7 +66,7 @@
/** Local collection of error strings, passed on to callers if
possible. */
protected $m_errors = array();
- public function __construct( $parentstore, $dbslave ) {
+ public function __construct( $parentstore, DatabaseBase $dbslave ) {
$this-m_store = $parentstore;
$this-m_dbs = $dbslave;
}
@@ -593,7 +593,7 @@
* SMWValueDescription objects, create and return a plain WHERE
condition
* string for it.
*/
- protected function compileAttributeWhere( $query, SMWDescription
$description, $proptable, $valueindex, $operator = 'AND' ) {
+ protected function compileAttributeWhere( $query, SMWDescription
$description, SMWSQLStore2Table $proptable, $valueindex, $operator = 'AND' ) {
$where = '';
if ( $description instanceof SMWValueDescription ) {
$dv = $description-getDatavalue();
@@ -610,15 +610,9 @@
case SMW_CMP_LEQ: $comp = '=';
break;
case SMW_CMP_GEQ: $comp = '=';
break;
case SMW_CMP_NEQ: $comp = '!=';
break;
- case SMW_CMP_LIKE:
- // TODO: explicitly
excluding _geo here is a temporary workaround. Future versions will use
personalised comparators for extensions and not LIKE (requires synchronisation
with SemanticMaps to work)
- if ( ( $dv-getTypeID()
!= '_geo' ) ( ( $fieldtype == 't' ) || ( $fieldtype == 'l' ) ) ) { // string
data allows pattern matches
- $comp = ' LIKE
';
- $value =
str_replace( array( '%', '_', '*', '?' ), array( '\%', '\_', '%', '_' ), $value
); // translate pattern
- }
- break;
}
- if ( $comp == '' ) { // allow
extensions to define their own query conditions
+ if ( $comp == '' ) { // Allow
extensions to define their own query conditions.
+ // FIXME: only one fieldname is
passed, which won't work when multiple fields are needed.
wfRunHooks(
'smwGetSQLConditionForValue', array( $where, $description, $query-alias,
$fieldname, $this-m_dbs ) );
} else {
$where =
{$query-alias}.{$fieldname}{$comp} . $this-m_dbs-addQuotes( $value );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
