[MediaWiki-CVS] SVN: [71151] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71151
Revision: 71151
Author: jeroendedauw
Date: 2010-08-15 21:40:58 + (Sun, 15 Aug 2010)
Log Message:
---
Work on Special:Update
Modified Paths:
--
trunk/extensions/Deployment/Deployment.i18n.php
trunk/extensions/Deployment/specials/SpecialUpdate.php
Modified: trunk/extensions/Deployment/Deployment.i18n.php
===
--- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 21:19:00 UTC
(rev 71150)
+++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 21:40:58 UTC
(rev 71151)
@@ -74,6 +74,8 @@
'extensions-updates-available' => 'The following extensions have new
versions available.
Check the ones you want to update and then click “Update Extensions”.',
'special-update-extensions' => 'Extensions',
+ 'update-extensions-button' => 'Extensions',
+ 'select-all-extensions' => 'Select all',
// Special:Install
'extensions-description' => 'Extensions extend and expand the
functionality of MediaWiki.
Modified: trunk/extensions/Deployment/specials/SpecialUpdate.php
===
--- trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
21:19:00 UTC (rev 71150)
+++ trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
21:40:58 UTC (rev 71151)
@@ -117,13 +117,35 @@
if ( count( $extensions ) > 0 ) {
$wgOut->addWikiMsg( 'extensions-updates-available' );
- // TODO
+ $wgOut->addHTML( Html::element( 'button', array(),
wfMsg( 'update-extensions-button' ) ) );
+ $wgOut->addHTML( '' );
+
+ // TODO: select all magic
+
+ $wgOut->addHTML(
+ '' .
+ Html::element( 'input', array( 'type' =>
'checkbox', 'id' => 'select-all-extensions' ) ) .
+ '' .
+ Html::element( 'label', array( 'for' =>
'select-all-extensions' ), wfMsg( 'select-all-extensions' ) ) .
+ ''
+ );
+
foreach ( $extensions as $extension ) {
$this->displayExtensionStatus( $extension );
}
- // TODO
+ $wgOut->addHTML(
+ '' .
+ Html::element( 'input', array( 'type' =>
'checkbox', 'id' => 'select-all-extensions-2' ) ) .
+ '' .
+ Html::element( 'label', array( 'for' =>
'select-all-extensions-2' ), wfMsg( 'select-all-extensions' ) ) .
+ ''
+ );
+
+ $wgOut->addHTML( '' );
+
+ $wgOut->addHTML( Html::element( 'button', array(),
wfMsg( 'update-extensions-button' ) ) );
}
else {
$wgOut->addWikiMsg( 'extensions-up-to-date' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71150] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71150
Revision: 71150
Author: jeroendedauw
Date: 2010-08-15 21:19:00 + (Sun, 15 Aug 2010)
Log Message:
---
Work on Special:Update
Modified Paths:
--
trunk/extensions/Deployment/Deployment.i18n.php
trunk/extensions/Deployment/specials/SpecialUpdate.php
Modified: trunk/extensions/Deployment/Deployment.i18n.php
===
--- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 20:45:49 UTC
(rev 71149)
+++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 21:19:00 UTC
(rev 71150)
@@ -65,12 +65,15 @@
// Special:Update
'mediawiki-up-to-date' => 'You have the latest version of MediaWiki
installed.',
- 'mediawiki-up-to-date-long' => 'You have the latest version of
MediaWiki [[[Special:Version|installed]].
+ 'mediawiki-up-to-date-long' => 'You have the latest version of
MediaWiki [[Special:Version|installed]].
You do not need to update.',
'mediawiki-update-available' => 'A new version of MediaWiki is
available!',
'mediawiki-update-available-long' => 'MediaWiki version $1 is available.
[$2 Update now] to keep your wiki secure and get the new features in this
release.',
- 'extensions-up-to-date' => 'Your extensions are all up to date.',
+ 'extensions-up-to-date' => '[[Special:Extensions|Your extensions]] are
all up to date.',
+ 'extensions-updates-available' => 'The following extensions have new
versions available.
+Check the ones you want to update and then click “Update Extensions”.',
+ 'special-update-extensions' => 'Extensions',
// Special:Install
'extensions-description' => 'Extensions extend and expand the
functionality of MediaWiki.
Modified: trunk/extensions/Deployment/specials/SpecialUpdate.php
===
--- trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
20:45:49 UTC (rev 71149)
+++ trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
21:19:00 UTC (rev 71150)
@@ -90,7 +90,7 @@
protected function showCoreStatus( $status ) {
global $wgOut, $wgVersion;
- if ( $status !== false ) {
+ if ( $status === false ) {
$wgOut->addHTML( '' . wfMsg( 'mediawiki-up-to-date'
) . '' );
$wgOut->addWikiMsg( 'mediawiki-up-to-date-long' );
}
@@ -110,9 +110,36 @@
* @param $extensions Array: the extensions that have updates and their
version numbers.
*/
protected function showExtensionStatuses( array $extensions ) {
+ global $wgOut;
+
+ $wgOut->addHTML( '' . wfMsg( 'special-update-extensions' )
. '' );
+
+ if ( count( $extensions ) > 0 ) {
+ $wgOut->addWikiMsg( 'extensions-updates-available' );
+
+ // TODO
+
+ foreach ( $extensions as $extension ) {
+ $this->displayExtensionStatus( $extension );
+ }
+
+ // TODO
+ }
+ else {
+ $wgOut->addWikiMsg( 'extensions-up-to-date' );
+ }
+ }
+
+ /**
+* Displays a single row in the update list.
+*
+* @since 0.1
+*
+* @param $extension Array
+*/
+ protected function displayExtensionStatus( $extension ) {
global $wgOut, $wgExtensionCredits;
- //$wgOut->addHTML( var_dump($extensions) );
// TODO
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71149] trunk/extensions/ProofreadPage
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71149
Revision: 71149
Author: thomasv
Date: 2010-08-15 20:45:49 + (Sun, 15 Aug 2010)
Log Message:
---
make image width in edit mode configurable from the index page.
Modified Paths:
--
trunk/extensions/ProofreadPage/ProofreadPage.php
trunk/extensions/ProofreadPage/proofread.js
Modified: trunk/extensions/ProofreadPage/ProofreadPage.php
===
--- trunk/extensions/ProofreadPage/ProofreadPage.php2010-08-15 20:39:02 UTC
(rev 71148)
+++ trunk/extensions/ProofreadPage/ProofreadPage.php2010-08-15 20:45:49 UTC
(rev 71149)
@@ -37,9 +37,6 @@
# Group allowed to modify pagequality
$wgGroupPermissions['user']['pagequality'] = true;
-# Max width of zoomable image
-$wgProofreadPageMaxWidth = 2048;
-
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'ProofreadPage',
@@ -232,8 +229,9 @@
$footer = str_replace( "$key", $val, $footer );
}
$css = $attributes['css'] ? $attributes['css'] : "";
+ $edit_width = $attributes['width'] ? $attributes['width'] : "";
- return array( $index_url, $prev_url, $next_url, $header, $footer, $css
);
+ return array( $index_url, $prev_url, $next_url, $header, $footer, $css,
$edit_width );
}
@@ -394,37 +392,27 @@
if ( $image && $image->exists() ) {
$width = $image->getWidth();
$height = $image->getHeight();
- if( $width > $wgProofreadPageMaxWidth ) {
- $width = $wgProofreadPageMaxWidth;
- $height = $image->getHeight() *
$wgProofreadPageMaxWidth / $image->getWidth();
- }
if ( $m[2] ) {
- $viewName = $image->thumbName( array( 'width' =>
$width, 'page' => $m[3] ) );
- $viewURL = $image->getThumbUrl( $viewName );
-
$thumbName = $image->thumbName( array( 'width' =>
'##WIDTH##', 'page' => $m[3] ) );
- $thumbURL = $image->getThumbUrl( $thumbName );
} else {
- $viewURL = $image->getViewURL();
$thumbName = $image->thumbName( array( 'width' =>
'##WIDTH##' ) );
- $thumbURL = $image->getThumbUrl( $thumbName );
}
+ $thumbURL = $image->getThumbUrl( $thumbName );
$thumbURL = str_replace( '%23', '#', $thumbURL );
} else {
$width = 0;
$height = 0;
- $viewURL = '';
$thumbURL = '';
}
- list( $index_url, $prev_url, $next_url, $header, $footer, $css ) =
pr_navigation( $wgTitle );
+ list( $index_url, $prev_url, $next_url, $header, $footer, $css,
$edit_width ) = pr_navigation( $wgTitle );
$jsFile = htmlspecialchars(
"$wgScriptPath/extensions/ProofreadPage/proofread.js?$wgProofreadPageVersion" );
$jsVars = array(
'proofreadPageWidth' => intval( $width ),
'proofreadPageHeight' => intval( $height ),
- 'proofreadPageViewURL' => $viewURL,
+ 'proofreadPageEditWidth' => $edit_width,
'proofreadPageThumbURL' => $thumbURL,
'proofreadPageIsEdit' => intval( $isEdit ),
'proofreadPageIndexURL' => $index_url,
@@ -893,7 +881,7 @@
$page_regexp =
"/^(.*?)<\/noinclude>(.*?)(.*?)<\/noinclude>$/s";
if( !preg_match( $page_regexp, $text, $m ) ) {
pr_load_index( $wgTitle );
- list( $index_url, $prev_url, $next_url, $header, $footer, $css
) = pr_navigation( $wgTitle );
+ list( $index_url, $prev_url, $next_url, $header, $footer, $css,
$edit_width ) = pr_navigation( $wgTitle );
$new_text = ""
."$header\n\n\n$text\n$footer";
return array( -1, null, $new_text );
Modified: trunk/extensions/ProofreadPage/proofread.js
===
--- trunk/extensions/ProofreadPage/proofread.js 2010-08-15 20:39:02 UTC (rev
71148)
+++ trunk/extensions/ProofreadPage/proofread.js 2010-08-15 20:45:49 UTC (rev
71149)
@@ -1,6 +1,10 @@
// Author : ThomasV - License : GPL
+/* Default size of the high resolution image in edit mode */
+self.proofreadPageDefaultEditWidth = 1024;
+
+
function pr_init_tabs(){
var a = document.getElementById("p-namespaces");
if(!a) a = document.getElementById("p-cactions");
@@ -9,10 +13,11 @@
var b = a.getElementsByTagName("ul");
if (!b) return;
- if(self.proofreadPageViewURL) {
+ if( self.proofreadPageThumbURL ) {
+ var view_url =
self.proofreadPageThumbURL.replace('##WIDTH##',"" + self.proofreadPageWidth );
b[0].innerHTML = b[0].innerHT
[MediaWiki-CVS] SVN: [71148] branches/img_metadata/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71148
Revision: 71148
Author: bawolff
Date: 2010-08-15 20:39:02 + (Sun, 15 Aug 2010)
Log Message:
---
Add support for extracting metadata in PNG iTXt, tXEt and zTXt chunks.
(semi follow-up to 70860 )
Modified Paths:
--
branches/img_metadata/phase3/includes/media/BitmapMetadataHandler.php
branches/img_metadata/phase3/includes/media/FormatMetadata.php
branches/img_metadata/phase3/includes/media/PNGMetadataExtractor.php
branches/img_metadata/phase3/languages/messages/MessagesEn.php
branches/img_metadata/phase3/maintenance/language/messageTypes.inc
branches/img_metadata/phase3/maintenance/language/messages.inc
Modified: branches/img_metadata/phase3/includes/media/BitmapMetadataHandler.php
===
--- branches/img_metadata/phase3/includes/media/BitmapMetadataHandler.php
2010-08-15 19:59:27 UTC (rev 71147)
+++ branches/img_metadata/phase3/includes/media/BitmapMetadataHandler.php
2010-08-15 20:39:02 UTC (rev 71148)
@@ -13,7 +13,7 @@
private $metadata = Array();
private $metaPriority = Array(
20 => Array( 'other' ),
- 40 => Array( 'file-comment' ),
+ 40 => Array( 'file-comment', 'native-png' ),
60 => Array( 'iptc-good-hash', 'iptc-no-hash' ),
70 => Array( 'xmp-deprected' ),
80 => Array( 'xmp-general' ),
@@ -161,15 +161,17 @@
$meta = new self( $filename );
$array = PNGMetadataExtractor::getMetadata( $filename );
- if ( isset( $array['xmp'] ) && $array['xmp'] !== '' && $showXMP
) {
+ if ( isset( $array['text']['xmp']['x-default'] ) &&
$array['text']['xmp']['x-default'] !== '' && $showXMP ) {
$xmp = new XMPReader();
- $xmp->parse( $array['xmp'] );
+ $xmp->parse( $array['text']['xmp']['x-default'] );
$xmpRes = $xmp->getResults();
foreach ( $xmpRes as $type => $xmpSection ) {
$meta->addMetadata( $xmpSection, $type );
}
}
- unset( $array['xmp'] );
+ unset( $array['text']['xmp'] );
+ $meta->addMetadata( $array['text'], 'native-png' );
+ unset( $array['text'] );
$array['metadata'] = $meta->getMetadataArray();
$array['metadata']['_MW_PNG_VERSION'] = '1';
return $array;
Modified: branches/img_metadata/phase3/includes/media/FormatMetadata.php
===
--- branches/img_metadata/phase3/includes/media/FormatMetadata.php
2010-08-15 19:59:27 UTC (rev 71147)
+++ branches/img_metadata/phase3/includes/media/FormatMetadata.php
2010-08-15 20:39:02 UTC (rev 71148)
@@ -652,7 +652,10 @@
case 'MorePermissionsUrl':
case 'AttributionUrl':
case 'PreferredAttributionName':
-
+ case 'PNGFileComment':
+ case 'Disclaimer':
+ case 'ContentWarning':
+
$val = htmlspecialchars( $val );
break;
@@ -748,7 +751,7 @@
$content = '';
$cLang = $wgContLang->getCode();
- $default = false;
+ $defaultItem = false;
$defaultLang = false;
// If default is set, save it for later,
Modified: branches/img_metadata/phase3/includes/media/PNGMetadataExtractor.php
===
--- branches/img_metadata/phase3/includes/media/PNGMetadataExtractor.php
2010-08-15 19:59:27 UTC (rev 71147)
+++ branches/img_metadata/phase3/includes/media/PNGMetadataExtractor.php
2010-08-15 20:39:02 UTC (rev 71148)
@@ -9,18 +9,39 @@
class PNGMetadataExtractor {
static $png_sig;
static $CRC_size;
+ static $text_chunks;
static function getMetadata( $filename ) {
self::$png_sig = pack( "C8", 137, 80, 78, 71, 13, 10, 26, 10 );
self::$CRC_size = 4;
+ /* based on list at
http://owl.phy.queensu.ca/~phil/exiftool/TagNames/PNG.html#TextualData
+* and http://www.w3.org/TR/PNG/#11keywords
+*/
+ self::$text_chunks = array(
+ 'XML:com.adobe.xmp' => 'xmp',
+ 'Artist' => 'Artist', # this is unofficial,
compared to Author, which is
+ 'Model' => 'Model',
+
[MediaWiki-CVS] SVN: [71147] trunk/extensions/SignDocument/SpecialSignDocument.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71147 Revision: 71147 Author: siebrand Date: 2010-08-15 19:59:27 + (Sun, 15 Aug 2010) Log Message: --- Use instead of Modified Paths: -- trunk/extensions/SignDocument/SpecialSignDocument.i18n.php Modified: trunk/extensions/SignDocument/SpecialSignDocument.i18n.php === --- trunk/extensions/SignDocument/SpecialSignDocument.i18n.php 2010-08-15 19:54:56 UTC (rev 71146) +++ trunk/extensions/SignDocument/SpecialSignDocument.i18n.php 2010-08-15 19:59:27 UTC (rev 71147) @@ -24,8 +24,8 @@ 'sign-phone' => 'Phone number:', 'sign-bday'=> 'Age:', 'sign-email' => 'E-mail address:', - 'sign-indicates-req' => '* Indicates required field.', - 'sign-hide-note' => '** Note: Unlisted information will still be visible to moderators.', + 'sign-indicates-req' => '* Indicates required field.', + 'sign-hide-note' => '** Note: Unlisted information will still be visible to moderators.', 'sign-list-anonymous' => 'List anonymously', 'sign-list-hideaddress' => 'Do not list address', 'sign-list-hideextaddress' => 'Do not list city, state, postal code, or country', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71146] trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71146
Revision: 71146
Author: siebrand
Date: 2010-08-15 19:54:56 + (Sun, 15 Aug 2010)
Log Message:
---
Use instead of and
Modified Paths:
--
trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php
Modified: trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php
===
--- trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php 2010-08-15
19:23:05 UTC (rev 71145)
+++ trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php 2010-08-15
19:54:56 UTC (rev 71146)
@@ -39,7 +39,7 @@
'whitelistedit' => 'White list access editor',
'whitelist' => 'White list pages',
'mywhitelistpages' => 'My pages',
- 'whitelistfor' => "Current information for $1",
+ 'whitelistfor' => "Current
information for $1",
'whitelisttablemodify' => 'Modify',
'whitelisttablemodifyall' => 'All',
'whitelisttablemodifynone' => 'None',
@@ -66,7 +66,7 @@
'whitelistnewtablereview' => 'Review',
'whitelistselectrestricted' => '== Select restricted user name ==',
'whitelistpagelist' => "{{SITENAME}} pages for $1",
- 'whitelistnocalendar' => "It looks like
[http://www.mediawiki.org/wiki/Extension:Usage_Statistics
Extension:UsageStatistics], a prerequisite for this extension, was not
installed properly!",
+ 'whitelistnocalendar' => "It looks like
[http://www.mediawiki.org/wiki/Extension:Usage_Statistics
Extension:UsageStatistics], a prerequisite for this extension, was not
installed properly!",
'whitelistoverview' => "== Overview of changes for $1 ==",
'whitelistoverviewcd' => "* Changing date to '''$1''' for [[:$2|$2]]",
'whitelistoverviewsa' => "* Setting access to '''$1''' for [[:$2|$2]]",
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71145] trunk/extensions/Translate/groups/MediaWikiExtensions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71145 Revision: 71145 Author: siebrand Date: 2010-08-15 19:23:05 + (Sun, 15 Aug 2010) Log Message: --- Follow-up r71139: also remove MWReleases from $wmfextensions Modified Paths: -- trunk/extensions/Translate/groups/MediaWikiExtensions.php Modified: trunk/extensions/Translate/groups/MediaWikiExtensions.php === --- trunk/extensions/Translate/groups/MediaWikiExtensions.php 2010-08-15 19:17:05 UTC (rev 71144) +++ trunk/extensions/Translate/groups/MediaWikiExtensions.php 2010-08-15 19:23:05 UTC (rev 71145) @@ -407,7 +407,6 @@ 'ext-intersection', 'ext-labeledsectiontransclusion', // Wikisource 'ext-liquidthreads', // 2009-11-11: MediaWiki.org and some *.labs.wikimedia.org - 'ext-mwreleases', // 2009-09-29: MediaWiki.org 'ext-mwsearch', 'ext-newusermessage', 'ext-nuke', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71144] trunk/extensions/Distribution
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71144
Revision: 71144
Author: siebrand
Date: 2010-08-15 19:17:05 + (Sun, 15 Aug 2010)
Log Message:
---
L10n updates and add a FIXME about extension credits.
Modified Paths:
--
trunk/extensions/Distribution/Distribution.i18n.php
trunk/extensions/Distribution/Distribution.php
Modified: trunk/extensions/Distribution/Distribution.i18n.php
===
--- trunk/extensions/Distribution/Distribution.i18n.php 2010-08-15 19:08:27 UTC
(rev 71143)
+++ trunk/extensions/Distribution/Distribution.i18n.php 2010-08-15 19:17:05 UTC
(rev 71144)
@@ -19,18 +19,17 @@
// General
'distribution-desc' => 'Extension that serves as a package distribution
system for MediaWiki and extensions',
- 'mwr-desc' => 'Manages releases of the MediaWiki software',
'releasemanager' => 'MediaWiki release manager',
'releasemanager-header' => 'Welcome to the MediaWiki release manager.
Use the options below to manage the releases',
'releasemanager-add' => 'Add new release',
- 'releasemanager-supported-til-eol' => 'Supported until EOL date,
currently: $1', // $1 is yes/no
+ 'releasemanager-supported-til-eol' => 'Supported until End of Life
date, currently: $1', // $1 is yes/no
'releasemanager-supported-overriden' => 'Support overridden, currently:
$1', // $1 is yes/no
'releasemanager-doesnotexist' => 'The specified release does not exist',
'releasemanager-delete-confirm' => 'Are you sure you want to delete
this release?',
'downloadmediawiki' => 'Download MediaWiki',
'mwr-field-name' => 'Name',
'mwr-field-number' => 'Number',
- 'mwr-field-eoldate' => 'End of life date',
+ 'mwr-field-eoldate' => 'End of Life date',
'mwr-field-reldate' => 'Release date',
'mwr-field-announcement' => 'Announcement URL',
'mwr-field-supported' => 'Supported flag',
Modified: trunk/extensions/Distribution/Distribution.php
===
--- trunk/extensions/Distribution/Distribution.php 2010-08-15 19:08:27 UTC
(rev 71143)
+++ trunk/extensions/Distribution/Distribution.php 2010-08-15 19:17:05 UTC
(rev 71144)
@@ -64,6 +64,7 @@
*
* @since 0.1
*/
+// FIXME: no need to put these extension credits in a hook.
function efDistributionSetup() {
global $wgExtensionCredits;
@@ -108,4 +109,4 @@
);
return true;
-}
\ No newline at end of file
+}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71143] trunk/extensions/Deployment/Deployment.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71143
Revision: 71143
Author: siebrand
Date: 2010-08-15 19:08:27 + (Sun, 15 Aug 2010)
Log Message:
---
Follow-up r71102: provide link text.
Modified Paths:
--
trunk/extensions/Deployment/Deployment.i18n.php
Modified: trunk/extensions/Deployment/Deployment.i18n.php
===
--- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 19:04:15 UTC
(rev 71142)
+++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 19:08:27 UTC
(rev 71143)
@@ -56,7 +56,7 @@
'extension-type-all' => 'All',
'extension-bulk-actions' => 'Bulk Actions',
'extension-page-explanation' => 'This page lists the installed
extensions on this wiki.
-For more info about this wiki installation, see [[Special:Version]].',
+For more info about this wiki installation, see
[[Special:Version|{{int:version}}]].',
'extension-none-installed' => 'There are currently no extensions
installed.
You can [[$1|add new ones]].',
'extension-empty-category' => 'There are no extensions of type
\'\'$1\'\' installed.',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71142] trunk/phase3/maintenance/language/messageTypes.inc
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71142 Revision: 71142 Author: siebrand Date: 2010-08-15 19:04:15 + (Sun, 15 Aug 2010) Log Message: --- Follow-up r71095: add new message to $wgIgnoredMessages. Modified Paths: -- trunk/phase3/maintenance/language/messageTypes.inc Modified: trunk/phase3/maintenance/language/messageTypes.inc === --- trunk/phase3/maintenance/language/messageTypes.inc 2010-08-15 18:58:03 UTC (rev 71141) +++ trunk/phase3/maintenance/language/messageTypes.inc 2010-08-15 19:04:15 UTC (rev 71142) @@ -108,6 +108,7 @@ 'shareddescriptionfollows', 'signature', 'signature-anon', + 'signupstart', 'signupend', 'sitenotice', 'sitesubtitle', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71141] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71141 Revision: 71141 Author: siebrand Date: 2010-08-15 18:58:03 + (Sun, 15 Aug 2010) Log Message: --- * L10n review * whitespace updates Modified Paths: -- trunk/extensions/Deployment/Deployment.alias.php trunk/extensions/Deployment/Deployment.i18n.php trunk/extensions/Deployment/Deployment.php Modified: trunk/extensions/Deployment/Deployment.alias.php === --- trunk/extensions/Deployment/Deployment.alias.php2010-08-15 18:55:08 UTC (rev 71140) +++ trunk/extensions/Deployment/Deployment.alias.php2010-08-15 18:58:03 UTC (rev 71141) @@ -19,4 +19,4 @@ 'Extensions' => array( 'Extensions' ), 'Install' => array( 'Install' ), 'Update' => array( 'Update', 'Updates' ), -); \ No newline at end of file +); Modified: trunk/extensions/Deployment/Deployment.i18n.php === --- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 18:55:08 UTC (rev 71140) +++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 18:58:03 UTC (rev 71141) @@ -16,11 +16,11 @@ */ $messages['en'] = array( // General - 'deployment-desc' => 'Provides a way to install extensions via GUI and update them and the wiki itself via another GUI', + 'deployment-desc' => 'Provides a way to [[Special:Install|install MediaWiki extensions]] and [[Special:Update|update MediaWiki and MediaWiki extensions]]', 'extension' => 'Extension', 'extension-name-missing' => '[no name]', 'version-unknown' => 'unknown', - + // Special pages 'specialpages-group-administration' => 'Wiki administration', @@ -55,28 +55,34 @@ 'add-new-extensions' => 'Add new', 'extension-type-all' => 'All', 'extension-bulk-actions' => 'Bulk Actions', - 'extension-page-explanation' => 'This page lists the installed extensions on this wiki. For more info about this wiki installation, see [[Special:Version]].', - 'extension-none-installed' => 'There are currently no extensions installed. You can [[$1|add new ones]].', + 'extension-page-explanation' => 'This page lists the installed extensions on this wiki. +For more info about this wiki installation, see [[Special:Version]].', + 'extension-none-installed' => 'There are currently no extensions installed. +You can [[$1|add new ones]].', 'extension-empty-category' => 'There are no extensions of type \'\'$1\'\' installed.', - 'extension-invalid-category' => 'Could not filter on extension type \'\'$1\'\', all extenions are shown instead.', + 'extension-invalid-category' => 'Could not filter on extension type \'\'$1\'\'. +All extensions are shown instead.', // Special:Update - 'mediawiki-up-to-date' => 'You have the latest version of MediaWiki.', - 'mediawiki-up-to-date-long' => 'You have the latest version of MediaWiki ([[Special:Version|view version]]). You do not need to upgrade.', + 'mediawiki-up-to-date' => 'You have the latest version of MediaWiki installed.', + 'mediawiki-up-to-date-long' => 'You have the latest version of MediaWiki [[[Special:Version|installed]]. +You do not need to update.', 'mediawiki-update-available' => 'A new version of MediaWiki is available!', - 'mediawiki-update-available-long' => 'MediaWiki version $1 is available. [$2 Upgrade now] to keep your wiki secure and get the new awesome features in this release.', + 'mediawiki-update-available-long' => 'MediaWiki version $1 is available. +[$2 Update now] to keep your wiki secure and get the new features in this release.', 'extensions-up-to-date' => 'Your extensions are all up to date.', - + // Special:Install - 'extensions-description' => 'Extensions extend and expand the functionality of MediaWiki. You can browse and search extensions that are in the [$1 MediaWiki Extension Repository] to install via this page.', + 'extensions-description' => 'Extensions extend and expand the functionality of MediaWiki. +You can browse and search extensions that are in the [$1 MediaWiki Extension Repository] to install via this page.', 'search-extensions' => 'Search', - 'search-extensions-long' => 'Search for extensions by keyword, author, or tag.', + 'search-extensions-long' => 'Search for extensions by keyword, author or tag.', 'search-term' => 'Term', 'search-author' => 'Author', 'search-tag' => 'Tag', 'search-extensions-button' => 'Search extensions', 'popular-extension-tags' => 'Popular tags', - 'popular-extension-tags-long' => 'You may also browse based on the most popular tags in the Extension Repository:', + 'popular-extension-tags-long' => 'You may also browse based on the most popular ta
[MediaWiki-CVS] SVN: [71140] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71140
Revision: 71140
Author: demon
Date: 2010-08-15 18:55:08 + (Sun, 15 Aug 2010)
Log Message:
---
Initial refactoring for Postgres; DatabaseUpdater subclass is now passed to
LoadExtensionSchemaUpdates
Modified Paths:
--
trunk/phase3/docs/hooks.txt
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/installer/CoreInstaller.php
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/Installer.php
trunk/phase3/maintenance/updaters.inc
Added Paths:
---
trunk/phase3/includes/installer/PostgresUpdater.php
Modified: trunk/phase3/docs/hooks.txt
===
--- trunk/phase3/docs/hooks.txt 2010-08-15 18:46:22 UTC (rev 71139)
+++ trunk/phase3/docs/hooks.txt 2010-08-15 18:55:08 UTC (rev 71140)
@@ -1031,8 +1031,8 @@
'ListDefinedTags': When trying to find all defined tags.
&$tags: The list of tags.
-'LoadExtensionSchemaUpdates': called by maintenance/updaters.inc when upgrading
-database schema
+'LoadExtensionSchemaUpdates': called during database installation and updates
+&updater: A DatabaseUpdater subclass
'LocalFile::getHistory': called before file history query performed
$file: the file
Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2010-08-15 18:46:22 UTC (rev
71139)
+++ trunk/phase3/includes/AutoLoader.php2010-08-15 18:55:08 UTC (rev
71140)
@@ -437,6 +437,7 @@
'MysqlInstaller' => 'includes/installer/MysqlInstaller.php',
'MysqlUpdater' => 'includes/installer/MysqlUpdater.php',
'PostgresInstaller' => 'includes/installer/PostgresInstaller.php',
+ 'PostgresUpdater' => 'includes/installer/PostgresUpdater.php',
'SqliteInstaller' => 'includes/installer/SqliteInstaller.php',
'SqliteUpdater' => 'includes/installer/SqliteUpdater.php',
'OracleInstaller' => 'includes/installer/OracleInstaller.php',
Modified: trunk/phase3/includes/installer/CoreInstaller.php
===
--- trunk/phase3/includes/installer/CoreInstaller.php 2010-08-15 18:46:22 UTC
(rev 71139)
+++ trunk/phase3/includes/installer/CoreInstaller.php 2010-08-15 18:55:08 UTC
(rev 71140)
@@ -200,7 +200,7 @@
$this->settings[$var] = $GLOBALS[$var];
}
- foreach ( $this->dbTypes as $type ) {
+ foreach ( self::getDBTypes() as $type ) {
$installer = $this->getDBInstaller( $type );
if ( !$installer->isCompiled() ) {
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:46:22 UTC
(rev 71139)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:55:08 UTC
(rev 71140)
@@ -26,17 +26,17 @@
}
public static function newForDB( $db, $shared ) {
- switch( $db->getType() ) {
- case 'mysql':
- case 'sqlite':
- case 'oracle':
- $class = ucfirst( $db->getType() ) . 'Updater';
- return new $class( $db, $shared );
- default:
- throw new MWException( __METHOD__ . ' called
for unsupported $wgDBtype' );
+ $type = $db->getType();
+ if( in_array( $type, Installer::getDBTypes() ) ) {
+ $class = ucfirst( $type ) . 'Updater';
+ return new $class( $db, $shared );
+ } else {
+ throw new MWException( __METHOD__ . ' called for
unsupported $wgDBtype' );
}
}
+ public function getDB() { return $this->db; }
+
public function doUpdates() {
global $IP, $wgVersion;
require_once( "$IP/maintenance/updaters.inc" );
Modified: trunk/phase3/includes/installer/Installer.php
===
--- trunk/phase3/includes/installer/Installer.php 2010-08-15 18:46:22 UTC
(rev 71139)
+++ trunk/phase3/includes/installer/Installer.php 2010-08-15 18:55:08 UTC
(rev 71140)
@@ -61,7 +61,7 @@
*
* @var array
*/
- protected $dbTypes = array(
+ protected static $dbTypes = array(
'mysql',
'postgres',
'sqlite',
@@ -118,8 +118,8 @@
/**
* Get a list of known DB types.
*/
- public function getDBTypes() {
- return $this->dbTypes;
+ public static function getDBTypes() {
+ return self::$dbTypes;
[MediaWiki-CVS] SVN: [71139] trunk/extensions/Translate/groups/mediawiki-defines.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71139 Revision: 71139 Author: siebrand Date: 2010-08-15 18:46:22 + (Sun, 15 Aug 2010) Log Message: --- Drop support for obsolete MWReleases (per r71131) Modified Paths: -- trunk/extensions/Translate/groups/mediawiki-defines.txt Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt === --- trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-15 18:24:26 UTC (rev 71138) +++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-15 18:46:22 UTC (rev 71139) @@ -714,9 +714,6 @@ id = ext-mwsearch file = MWSearch/MWSearch.i18n.php -MW Releases -ignored = mwreleases-list - Natural Language List descmsg = nll-desc ignored = nll-itemoutput ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71138] trunk/phase3/includes/installer/DatabaseUpdater.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71138
Revision: 71138
Author: demon
Date: 2010-08-15 18:24:26 + (Sun, 15 Aug 2010)
Log Message:
---
Ended up doing $doUser differently
Modified Paths:
--
trunk/phase3/includes/installer/DatabaseUpdater.php
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:18:02 UTC
(rev 71137)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:24:26 UTC
(rev 71138)
@@ -37,11 +37,11 @@
}
}
- public function doUpdates( $doUser = false ) {
+ public function doUpdates() {
global $IP, $wgVersion;
require_once( "$IP/maintenance/updaters.inc" );
$this->updates = array_merge( $this->getCoreUpdateList(),
- $this->getOldGlobalUpdates( $doUser ) );
+ $this->getOldGlobalUpdates() );
foreach ( $this->updates as $params ) {
$func = array_shift( $params );
call_user_func_array( $func, $params );
@@ -81,7 +81,7 @@
* version these like we do with our core updates, so they have to go
* in 'always'
*/
- private function getOldGlobalUpdates( $douser ) {
+ private function getOldGlobalUpdates() {
global $wgUpdates, $wgExtNewFields, $wgExtNewTables,
$wgExtModifiedFields, $wgExtNewIndexes, $wgSharedDB,
$wgSharedTables;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71137] trunk/phase3/includes/installer/DatabaseUpdater.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71137
Revision: 71137
Author: demon
Date: 2010-08-15 18:18:02 + (Sun, 15 Aug 2010)
Log Message:
---
Minor code style tweak
Modified Paths:
--
trunk/phase3/includes/installer/DatabaseUpdater.php
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:13:23 UTC
(rev 71136)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:18:02 UTC
(rev 71137)
@@ -28,11 +28,10 @@
public static function newForDB( $db, $shared ) {
switch( $db->getType() ) {
case 'mysql':
- return new MysqlUpdater( $db, $shared );
case 'sqlite':
- return new SqliteUpdater( $db, $shared );
case 'oracle':
- return new OracleUpdater( $db, $shared );
+ $class = ucfirst( $db->getType() ) . 'Updater';
+ return new $class( $db, $shared );
default:
throw new MWException( __METHOD__ . ' called
for unsupported $wgDBtype' );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71136] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71136
Revision: 71136
Author: demon
Date: 2010-08-15 18:13:23 + (Sun, 15 Aug 2010)
Log Message:
---
Some general update refactoring:
* Drop version keys. Don't really serve a purpose
* Don't use updatelog to determine if an update should be run, let the update
check itself (this was the old behavior)
* Still record updates as a single timestamped array (could be useful)
Modified Paths:
--
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/includes/installer/SqliteUpdater.php
trunk/phase3/maintenance/updaters.inc
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 17:27:58 UTC
(rev 71135)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-08-15 18:13:23 UTC
(rev 71136)
@@ -18,73 +18,44 @@
protected $db;
- protected function __construct( $db ) {
+ protected $shared = false;
+
+ protected function __construct( $db, $shared ) {
$this->db = $db;
+ $this->shared = $shared;
}
- public static function newForDB( $db ) {
+ public static function newForDB( $db, $shared ) {
switch( $db->getType() ) {
case 'mysql':
- return new MysqlUpdater( $db );
+ return new MysqlUpdater( $db, $shared );
case 'sqlite':
- return new SqliteUpdater( $db );
+ return new SqliteUpdater( $db, $shared );
case 'oracle':
- return new OracleUpdater( $db );
+ return new OracleUpdater( $db, $shared );
default:
throw new MWException( __METHOD__ . ' called
for unsupported $wgDBtype' );
}
}
- public function doUpdates() {
- global $IP;
+ public function doUpdates( $doUser = false ) {
+ global $IP, $wgVersion;
require_once( "$IP/maintenance/updaters.inc" );
- $this->loadUpdates();
- foreach ( $this->updates as $version => $updates ) {
- foreach( $updates as $params ) {
- $func = array_shift( $params );
- call_user_func_array( $func, $params );
- flush();
- }
- // some updates don't get recorded :(
- if( $version !== 'always' ) {
- $this->setAppliedUpdates( $version, $updates );
- }
+ $this->updates = array_merge( $this->getCoreUpdateList(),
+ $this->getOldGlobalUpdates( $doUser ) );
+ foreach ( $this->updates as $params ) {
+ $func = array_shift( $params );
+ call_user_func_array( $func, $params );
+ flush();
}
+ $this->setAppliedUpdates( $wgVersion, $this->updates );
}
- protected function loadUpdates() {
- // If the updatelog table hasn't been upgraded, we can't use
the new
- // style of recording our steps. Run all to be safe
- if( !$this->canUseNewUpdatelog() ) {
- $this->updates = $this->getCoreUpdateList();
- } else {
- foreach( $this->getCoreUpdateList() as $version =>
$updates ) {
- $appliedUpdates = $this->getAppliedUpdates(
$version );
- if( !$appliedUpdates || $appliedUpdates !=
$updates ) {
- $this->updates[ $version ] = $updates;
- }
- }
- }
- $this->getOldGlobalUpdates();
- }
-
- protected function getAppliedUpdates( $version ) {
- $key = "updatelist-$version";
- $val = $this->db->selectField( 'updatelog', 'ul_value',
- array( 'ul_key' => $key ), __METHOD__ );
- if( !$val ) {
- return null;
- } else {
- return unserialize( $val );
- }
- }
-
protected function setAppliedUpdates( $version, $updates = array() ) {
if( !$this->canUseNewUpdatelog() ) {
return;
}
- $key = "updatelist-$version";
- $this->db->delete( 'updatelog', array( 'ul_key' => $key ),
__METHOD__ );
+ $key = "updatelist-$version-" .
[MediaWiki-CVS] SVN: [71135] trunk/extensions/Translate/groups/mediawiki-defines.txt
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71135 Revision: 71135 Author: multichill Date: 2010-08-15 17:27:58 + (Sun, 15 Aug 2010) Log Message: --- Make wm-license-pd-wiki-link (added in r71126) optional. Modified Paths: -- trunk/extensions/Translate/groups/mediawiki-defines.txt Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt === --- trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-15 17:27:41 UTC (rev 71134) +++ trunk/extensions/Translate/groups/mediawiki-defines.txt 2010-08-15 17:27:58 UTC (rev 71135) @@ -1516,6 +1516,7 @@ optional = wm-license-cc-wiki-link, wm-license-cecill-wiki-link, wm-license-cecill-full-link, wm-license-fal-wiki-link, wm-license-fal-full-link optional = wm-license-fsf-wiki-link, wm-license-free-software-wiki-link, wm-license-gfdl-wiki-link, wm-license-gpl-wiki-link optional = wm-license-information-permission-reusing-link, wm-license-lgpl-wiki-link, wm-license-licensing-update-wiki-link +optional = wm-license-pd-wiki-link ignored = wm-license-gfdl-full-1.2-link, wm-license-gfdl-full-1.3-link, wm-license-gpl-2-full-link, wm-license-gpl-3-full-link ignored = wm-license-lgpl-2.1-full-link, wm-license-lgpl-3-full-link ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71134] trunk/phase3/includes/media
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71134 Revision: 71134 Author: ialex Date: 2010-08-15 17:27:41 + (Sun, 15 Aug 2010) Log Message: --- * Standardised file description headers * Added some descriptions Modified Paths: -- trunk/phase3/includes/media/BMP.php trunk/phase3/includes/media/Bitmap.php trunk/phase3/includes/media/Bitmap_ClientOnly.php trunk/phase3/includes/media/DjVu.php trunk/phase3/includes/media/GIF.php trunk/phase3/includes/media/GIFMetadataExtractor.php trunk/phase3/includes/media/Generic.php trunk/phase3/includes/media/MediaTransformOutput.php trunk/phase3/includes/media/PNG.php trunk/phase3/includes/media/PNGMetadataExtractor.php trunk/phase3/includes/media/SVG.php trunk/phase3/includes/media/Tiff.php Modified: trunk/phase3/includes/media/BMP.php === --- trunk/phase3/includes/media/BMP.php 2010-08-15 17:23:44 UTC (rev 71133) +++ trunk/phase3/includes/media/BMP.php 2010-08-15 17:27:41 UTC (rev 71134) @@ -1,5 +1,7 @@ https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71133] trunk/extensions/ExtensionDistributor/ExtensionDistributor. alias.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71133 Revision: 71133 Author: ialex Date: 2010-08-15 17:23:44 + (Sun, 15 Aug 2010) Log Message: --- CodeReview -> ExtensionDistributor :) Modified Paths: -- trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php Modified: trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php === --- trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php 2010-08-15 17:17:14 UTC (rev 71132) +++ trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php 2010-08-15 17:23:44 UTC (rev 71133) @@ -1,6 +1,6 @@ https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71132] trunk/extensions/ExtensionDistributor
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71132 Revision: 71132 Author: demon Date: 2010-08-15 17:17:14 + (Sun, 15 Aug 2010) Log Message: --- Add alias file. Can't believe nobody saw the notices Modified Paths: -- trunk/extensions/ExtensionDistributor/ExtensionDistributor.php Added Paths: --- trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php Added: trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php === --- trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php (rev 0) +++ trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php 2010-08-15 17:17:14 UTC (rev 71132) @@ -0,0 +1,16 @@ + array( 'ExtensionDistributor' ), +); Property changes on: trunk/extensions/ExtensionDistributor/ExtensionDistributor.alias.php ___ Added: svn:eol-style + native Modified: trunk/extensions/ExtensionDistributor/ExtensionDistributor.php === --- trunk/extensions/ExtensionDistributor/ExtensionDistributor.php 2010-08-15 16:57:49 UTC (rev 71131) +++ trunk/extensions/ExtensionDistributor/ExtensionDistributor.php 2010-08-15 17:17:14 UTC (rev 71132) @@ -37,6 +37,7 @@ $wgSpecialPageGroups['ExtensionDistributor'] = 'developer'; $wgAutoloadClasses['ExtensionDistributorPage'] = $dir . 'ExtensionDistributor_body.php'; $wgExtensionMessagesFiles['ExtensionDistributor'] = $dir . 'ExtensionDistributor.i18n.php'; +$wgExtensionAliasesFiles['ExtensionDistributor'] = $dir . 'ExtensionDistributor.alias.php'; $wgExtensionCredits['specialpage'][] = array( 'path' => __FILE__, ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71131] trunk/extensions/MWReleases
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71131
Revision: 71131
Author: demon
Date: 2010-08-15 16:57:49 + (Sun, 15 Aug 2010)
Log Message:
---
Revert back to pre r71085 rewrite. Extension has been obsoleted
Modified Paths:
--
trunk/extensions/MWReleases/MWReleases.i18n.php
trunk/extensions/MWReleases/MWReleases.php
Added Paths:
---
trunk/extensions/MWReleases/ApiMWReleases.php
trunk/extensions/MWReleases/OBSOLETE
Removed Paths:
-
trunk/extensions/MWReleases/MWReleases.alias.php
trunk/extensions/MWReleases/MWReleases.sql
trunk/extensions/MWReleases/api/
trunk/extensions/MWReleases/backend/
trunk/extensions/MWReleases/ui/
Copied: trunk/extensions/MWReleases/ApiMWReleases.php (from rev 71084,
trunk/extensions/MWReleases/ApiMWReleases.php)
===
--- trunk/extensions/MWReleases/ApiMWReleases.php
(rev 0)
+++ trunk/extensions/MWReleases/ApiMWReleases.php 2010-08-15 16:57:49 UTC
(rev 71131)
@@ -0,0 +1,51 @@
+ $version );
+ if( in_array( $status, $this->tags ) )
+ $r[$status] = '';
+ $results[] = $r;
+ }
+ }
+ $this->getResult()->setIndexedTagName($results, 'release');
+ $this->getResult()->addValue(null, $this->getModuleName(),
$results);
+ }
+
+ public function getDescription() {
+ return array (
+ 'Get the list of current Mediawiki releases'
+ );
+ }
+
+ protected function getExamples() {
+ return array(
+ 'api.php?action=mwreleases'
+ );
+ }
+ public function getVersion() {
+ return __CLASS__ . ': ' . MWRELEASES_VERSION;
+ }
+}
Deleted: trunk/extensions/MWReleases/MWReleases.alias.php
===
--- trunk/extensions/MWReleases/MWReleases.alias.php2010-08-15 16:57:07 UTC
(rev 71130)
+++ trunk/extensions/MWReleases/MWReleases.alias.php2010-08-15 16:57:49 UTC
(rev 71131)
@@ -1,17 +0,0 @@
- array( 'ReleaseManager' ),
- 'DownloadMediaWiki' => array( 'DownloadMediaWiki' ),
-);
Modified: trunk/extensions/MWReleases/MWReleases.i18n.php
===
--- trunk/extensions/MWReleases/MWReleases.i18n.php 2010-08-15 16:57:07 UTC
(rev 71130)
+++ trunk/extensions/MWReleases/MWReleases.i18n.php 2010-08-15 16:57:49 UTC
(rev 71131)
@@ -1,39 +1,419 @@
'Manages releases of the MediaWiki software',
- 'releasemanager' => 'MediaWiki release manager',
- 'releasemanager-header' => 'Welcome to the MediaWiki release manager.
Use the options below to manage the releases',
- 'releasemanager-add' => 'Add new release',
- 'releasemanager-supported-til-eol' => 'Supported until EOL date,
currently: $1', // $1 is yes/no
- 'releasemanager-supported-overriden' => 'Support overridden, currently:
$1', // $1 is yes/no
- 'releasemanager-doesnotexist' => 'The specified release does not exist',
- 'releasemanager-delete-confirm' => 'Are you sure you want to delete
this release?',
- 'downloadmediawiki' => 'Download MediaWiki',
- 'mwr-field-name' => 'Name',
- 'mwr-field-number' => 'Number',
- 'mwr-field-eoldate' => 'End of life date',
- 'mwr-field-reldate' => 'Release date',
- 'mwr-field-announcement' => 'Announcement URL',
- 'mwr-field-supported' => 'Supported flag',
- 'mwr-field-tag' => 'Tag name',
- 'mwr-field-branch' => 'Branch name',
+ 'mwreleases-desc' => 'Adds a [[Mediawiki:Mwreleases-list|list]] of
supported releases, accessible via the API',
+ 'mwreleases-list' => '# List the current and other active supported
MediaWiki releases like this:
+# current:1.15.1
+# supported:1.14.1'
);
/** Message documentation (Message documentation)
* @author Fryed-peach
*/
$messages['qqq'] = array(
- 'mwr-desc' => '{{desc}}',
+ 'mwreleases-desc' => '{{desc}}',
);
+
+/** Afrikaans (Afrikaans)
+ * @author Naudefj
+ */
+$messages['af'] = array(
+ 'mwreleases-desc' => "Voeg 'n [[Mediawiki:Mwreleases-list|lys]] van
ondersteunde MediaWiki-weergawes by, toeganklik via die API",
+);
+
+/** Arabic (العربية)
+ * @author Meno25
+ */
+$messages['ar'] = array(
+ 'mwreleases-desc' => 'يضيف [[Mediawiki:Mwreleases-list|قائمة]]
بالإصدارات المدعومة, يمن الوصول إليها من ال API',
+);
+
+/** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+ * @author EugeneZelenko
+ */
+$messages['be-tarask'] = array(
+ 'mwreleases-desc' => 'Дадае [[Mediawiki:Mwreleases-list|сьпіс]]
вэрсіяў, якія падтрымліваюцца, даступны праз API',
+);
+
+/** Bulgarian (Български)
+ * @author Turin
[MediaWiki-CVS] SVN: [71130] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71130
Revision: 71130
Author: ialex
Date: 2010-08-15 16:57:07 + (Sun, 15 Aug 2010)
Log Message:
---
Modified Special:Protectedpages and Special:Protectedtitles to subclass
SpecialPage
Modified Paths:
--
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/SpecialPage.php
trunk/phase3/includes/specials/SpecialProtectedpages.php
trunk/phase3/includes/specials/SpecialProtectedtitles.php
Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2010-08-15 16:49:36 UTC (rev
71129)
+++ trunk/phase3/includes/AutoLoader.php2010-08-15 16:57:07 UTC (rev
71130)
@@ -609,6 +609,8 @@
'SpecialMostlinkedtemplates' =>
'includes/specials/SpecialMostlinkedtemplates.php',
'SpecialPreferences' => 'includes/specials/SpecialPreferences.php',
'SpecialPrefixindex' => 'includes/specials/SpecialPrefixindex.php',
+ 'SpecialProtectedpages' =>
'includes/specials/SpecialProtectedpages.php',
+ 'SpecialProtectedtitles' =>
'includes/specials/SpecialProtectedtitles.php',
'SpecialRandomredirect' =>
'includes/specials/SpecialRandomredirect.php',
'SpecialRecentChanges' => 'includes/specials/SpecialRecentchanges.php',
'SpecialRecentchangeslinked' =>
'includes/specials/SpecialRecentchangeslinked.php',
Modified: trunk/phase3/includes/SpecialPage.php
===
--- trunk/phase3/includes/SpecialPage.php 2010-08-15 16:49:36 UTC (rev
71129)
+++ trunk/phase3/includes/SpecialPage.php 2010-08-15 16:57:07 UTC (rev
71130)
@@ -92,8 +92,8 @@
'Lonelypages' => array( 'SpecialPage',
'Lonelypages' ),
'Fewestrevisions' => array( 'SpecialPage',
'Fewestrevisions' ),
'Withoutinterwiki' => array( 'SpecialPage',
'Withoutinterwiki' ),
- 'Protectedpages'=> array( 'SpecialPage',
'Protectedpages' ),
- 'Protectedtitles' => array( 'SpecialPage',
'Protectedtitles' ),
+ 'Protectedpages'=> 'SpecialProtectedpages',
+ 'Protectedtitles' => 'SpecialProtectedtitles',
'Shortpages'=> array( 'SpecialPage',
'Shortpages' ),
'Uncategorizedcategories' => array( 'SpecialPage',
'Uncategorizedcategories' ),
'Uncategorizedimages' => array( 'SpecialPage',
'Uncategorizedimages' ),
Modified: trunk/phase3/includes/specials/SpecialProtectedpages.php
===
--- trunk/phase3/includes/specials/SpecialProtectedpages.php2010-08-15
16:49:36 UTC (rev 71129)
+++ trunk/phase3/includes/specials/SpecialProtectedpages.php2010-08-15
16:57:07 UTC (rev 71130)
@@ -26,17 +26,20 @@
*
* @ingroup SpecialPage
*/
-class ProtectedPagesForm {
+class SpecialProtectedpages extends SpecialPage {
protected $IdLevel = 'level';
protected $IdType = 'type';
- public function showList( $msg = '' ) {
+ public function __construct() {
+ parent::__construct( 'Protectedpages' );
+ }
+
+ public function execute( $par ) {
global $wgOut, $wgRequest;
- if( $msg != "" ) {
- $wgOut->setSubtitle( $msg );
- }
+ $this->setHeaders();
+ $this->outputHeader();
// Purge expired entries on one in every 10 queries
if( !mt_rand( 0, 10 ) ) {
@@ -352,11 +355,3 @@
return 'pr_id';
}
}
-
-/**
- * Constructor
- */
-function wfSpecialProtectedpages() {
- $ppForm = new ProtectedPagesForm();
- $ppForm->showList();
-}
Modified: trunk/phase3/includes/specials/SpecialProtectedtitles.php
===
--- trunk/phase3/includes/specials/SpecialProtectedtitles.php 2010-08-15
16:49:36 UTC (rev 71129)
+++ trunk/phase3/includes/specials/SpecialProtectedtitles.php 2010-08-15
16:57:07 UTC (rev 71130)
@@ -26,17 +26,20 @@
*
* @ingroup SpecialPage
*/
-class ProtectedTitlesForm {
+class SpecialProtectedtitles extends SpecialPage {
protected $IdLevel = 'level';
protected $IdType = 'type';
- function showList( $msg = '' ) {
+ public function __construct() {
+ parent::__construct( 'Protectedtitles' );
+ }
+
+ function execute( $par ) {
global $wgOut, $wgRequest;
- if ( $msg != "" ) {
- $wgOut->setSubtitle( $msg );
- }
+ $this->setHeaders();
+ $this->outputHeader();
// Purge expired entries on one in every 10 queries
[MediaWiki-CVS] SVN: [71129] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71129
Revision: 71129
Author: jeroendedauw
Date: 2010-08-15 16:49:36 + (Sun, 15 Aug 2010)
Log Message:
---
Added MediaWiki core update detection to Special:Update
Modified Paths:
--
trunk/extensions/Deployment/Deployment.i18n.php
trunk/extensions/Deployment/specials/SpecialUpdate.php
Modified: trunk/extensions/Deployment/Deployment.i18n.php
===
--- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 16:42:43 UTC
(rev 71128)
+++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 16:49:36 UTC
(rev 71129)
@@ -62,7 +62,9 @@
// Special:Update
'mediawiki-up-to-date' => 'You have the latest version of MediaWiki.',
- 'mediawiki-up-to-date-long' => 'You have the latest version of
MediaWiki. You do not need to upgrade.',
+ 'mediawiki-up-to-date-long' => 'You have the latest version of
MediaWiki ([[Special:Version|view version]]). You do not need to upgrade.',
+ 'mediawiki-update-available' => 'A new version of MediaWiki is
available!',
+ 'mediawiki-update-available-long' => 'MediaWiki version $1 is
available. [$2 Upgrade now] to keep your wiki secure and get the new awesome
features in this release.',
'extensions-up-to-date' => 'Your extensions are all up to date.',
// Special:Install
Modified: trunk/extensions/Deployment/specials/SpecialUpdate.php
===
--- trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
16:42:43 UTC (rev 71128)
+++ trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
16:49:36 UTC (rev 71129)
@@ -71,7 +71,7 @@
$this->showCoreStatus( false );
}
- $this->showExtensionStatuses( count( $updates )
> 0 ? $updates : false );
+ $this->showExtensionStatuses($updates );
}
} else {
@@ -85,12 +85,20 @@
*
* @since 0.1
*
-* @param $status
+* @param $status Mixed: false when there are no updates or a version
number (string) when there is.
*/
protected function showCoreStatus( $status ) {
- global $wgVersion;
+ global $wgOut, $wgVersion;
-
+ if ( $status !== false ) {
+ $wgOut->addHTML( '' . wfMsg( 'mediawiki-up-to-date'
) . '' );
+ $wgOut->addWikiMsg( 'mediawiki-up-to-date-long' );
+ }
+ else {
+ $wgOut->addHTML( '' . wfMsg(
'mediawiki-update-available' ) . '' );
+ // TODO: link
+ $wgOut->addWikiMsgArray(
'mediawiki-update-available-long', array( $status, '' ) );
+ }
}
/**
@@ -99,12 +107,12 @@
*
* @since 0.1
*
-* @param $status
+* @param $extensions Array: the extensions that have updates and their
version numbers.
*/
- protected function showExtensionStatuses() {
- global $wgExtensionCredits;
+ protected function showExtensionStatuses( array $extensions ) {
+ global $wgOut, $wgExtensionCredits;
-
+ //$wgOut->addHTML( var_dump($extensions) );
// TODO
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71128] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71128
Revision: 71128
Author: jeroendedauw
Date: 2010-08-15 16:42:43 + (Sun, 15 Aug 2010)
Log Message:
---
Error message tweaks
Modified Paths:
--
trunk/phase3/includes/PackageRepository.php
trunk/phase3/includes/installer/Installer.i18n.php
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/includes/PackageRepository.php
===
--- trunk/phase3/includes/PackageRepository.php 2010-08-15 16:36:31 UTC (rev
71127)
+++ trunk/phase3/includes/PackageRepository.php 2010-08-15 16:42:43 UTC (rev
71128)
@@ -99,6 +99,17 @@
*/
public function __construct( $location ) {
$this->location = $location;
- }
+ }
+
+ /**
+* Returns the repository location.
+*
+* @since 1.17
+*
+* @return string
+*/
+ public function getLocation() {
+ return $this->location;
+ }
}
\ No newline at end of file
Modified: trunk/phase3/includes/installer/Installer.i18n.php
===
--- trunk/phase3/includes/installer/Installer.i18n.php 2010-08-15 16:36:31 UTC
(rev 71127)
+++ trunk/phase3/includes/installer/Installer.i18n.php 2010-08-15 16:42:43 UTC
(rev 71128)
@@ -77,8 +77,7 @@
'config-env-php' => 'PHP $1 is installed.',
'config-env-latest-ok'=> 'You are installing the latest
version of Mediawiki.',
'config-env-latest-new' => "'''Note:''' You are installing a
development version of Mediawiki.",
- 'config-env-latest-can-not-check' => "'''Note:''' The installer was
unable to retrieve information about the latest MediaWiki release from [$1].",
- 'config-env-latest-data-invalid' => "'''Warning:''' When trying to
check if this version was outdated invalid data was retrieved from [$1].",
+ 'config-env-latest-can-not-check' => "'''Warning:''' The installer was
unable to retrieve information about the latest MediaWiki release from [$1].",
'config-env-latest-old' => "'''Warning:''' You are installing
an outdated version of Mediawiki.",
'config-env-latest-help' => 'You are installing version $1,
but the latest version is $2.
You are advised to use the latest release, which can be downloaded from
[http://www.mediawiki.org/wiki/Download mediawiki.org]',
Modified: trunk/phase3/includes/installer/Installer.php
===
--- trunk/phase3/includes/installer/Installer.php 2010-08-15 16:36:31 UTC
(rev 71127)
+++ trunk/phase3/includes/installer/Installer.php 2010-08-15 16:42:43 UTC
(rev 71128)
@@ -385,25 +385,19 @@
$repository = wfGetRepository();
$currentVersion = $repository->getLatestCoreVersion();
-
- /*
- if( !$latestInfo ) {
- $this->showMessage( 'config-env-latest-can-not-check',
$latestInfoUrl );
- return;
- }
- */
$this->setVar( '_ExternalHTTP', true );
if ( $currentVersion === false ) {
# For when the request is successful but there's e.g.
some silly man in
# the middle firewall blocking us, e.g. one of those
annoying airport ones
- $this->showMessage( 'config-env-latest-data-invalid',
$latestInfoUrl );
+ $this->showMessage( 'config-env-latest-can-not-check',
$repository->getLocation() );
return;
}
if( version_compare( $wgVersion, $currentVersion, '<' ) ) {
$this->showMessage( 'config-env-latest-old' );
+ // FIXME: this only works for the web installer!
$this->showHelpBox( 'config-env-latest-help',
$wgVersion, $currentVersion );
} elseif( version_compare( $wgVersion, $currentVersion, '>' ) )
{
$this->showMessage( 'config-env-latest-new' );
@@ -438,6 +432,7 @@
if ( !$compiledDBs ) {
$this->showMessage( 'config-no-db' );
+ // FIXME: this only works for the web installer!
$this->showHelpBox( 'config-no-db-help',
$wgLang->commaList( $allNames ) );
return false;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71127] trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71127
Revision: 71127
Author: multichill
Date: 2010-08-15 16:36:31 + (Sun, 15 Aug 2010)
Log Message:
---
Fix for r71126 (missed some escapes).
Modified Paths:
--
trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
Modified: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
===
--- trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-08-15 16:32:28 UTC (rev 71126)
+++ trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-08-15 16:36:31 UTC (rev 71127)
@@ -229,7 +229,7 @@
'wm-license-original-upload-log' => 'Original upload log',
'wm-license-own-work' => 'Own work',
'wm-license-pd-author-self-text' => 'I, the copyright holder of this
work, release this work into the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public
domain]]\'\'\'. This applies worldwide.',
- 'wm-license-pd-author-with-author-text' => 'This work has been released
into the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\' by its
author, '''$1'''. This applies worldwide.',
+ 'wm-license-pd-author-with-author-text' => 'This work has been released
into the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\' by its
author, \'\'\'$1\'\'\'. This applies worldwide.',
'wm-license-pd-author-not-legally-possible' => 'In some countries this
may not be legally possible; if so:',
'wm-license-pd-author-self-any-purpose' => 'I grant anyone the right to
use this work \'\'\'for any purpose\'\'\', without any conditions, unless such
conditions are required by law.',
'wm-license-pd-author-with-author-any-purpose' => '$1 grants anyone the
right to use this work \'\'\'for any purpose\'\'\', without any conditions,
unless such conditions are required by law.',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71126] trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71126
Revision: 71126
Author: multichill
Date: 2010-08-15 16:32:28 + (Sun, 15 Aug 2010)
Log Message:
---
Add pd-author messages
Modified Paths:
--
trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
Modified: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
===
--- trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-08-15 16:14:19 UTC (rev 71125)
+++ trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
2010-08-15 16:32:28 UTC (rev 71126)
@@ -228,6 +228,12 @@
'wm-license-licensing-update-wiki-link' => 'meta:Licensing update',
'wm-license-original-upload-log' => 'Original upload log',
'wm-license-own-work' => 'Own work',
+ 'wm-license-pd-author-self-text' => 'I, the copyright holder of this
work, release this work into the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public
domain]]\'\'\'. This applies worldwide.',
+ 'wm-license-pd-author-with-author-text' => 'This work has been released
into the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\' by its
author, '''$1'''. This applies worldwide.',
+ 'wm-license-pd-author-not-legally-possible' => 'In some countries this
may not be legally possible; if so:',
+ 'wm-license-pd-author-self-any-purpose' => 'I grant anyone the right to
use this work \'\'\'for any purpose\'\'\', without any conditions, unless such
conditions are required by law.',
+ 'wm-license-pd-author-with-author-any-purpose' => '$1 grants anyone the
right to use this work \'\'\'for any purpose\'\'\', without any conditions,
unless such conditions are required by law.',
+ 'wm-license-pd-wiki-link' => 'w:en:public domain',
'wm-license-self-one-license' => 'I, the copyright holder of this work,
hereby publish it under the following license:',
'wm-license-self-one-license-with-author' => '$1, the copyright holder
of this work, hereby publishes it under the following license:',
'wm-license-self-multiple-licenses' => 'I, the copyright holder of this
work, hereby publish it under the following licenses:',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71125] trunk/extensions/ProofreadPage/proofread.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71125
Revision: 71125
Author: thomasv
Date: 2010-08-15 16:14:19 + (Sun, 15 Aug 2010)
Log Message:
---
fix bug in quantization (size should be multiple of 100)
Modified Paths:
--
trunk/extensions/ProofreadPage/proofread.js
Modified: trunk/extensions/ProofreadPage/proofread.js
===
--- trunk/extensions/ProofreadPage/proofread.js 2010-08-15 15:13:26 UTC (rev
71124)
+++ trunk/extensions/ProofreadPage/proofread.js 2010-08-15 16:14:19 UTC (rev
71125)
@@ -62,7 +62,7 @@
}
else {
//enforce quantization: width must be multiple of 100px
- var width = (100*requested_width)/100;
+ var width = 100 * Math.round( requested_width /100 );
//compare to the width of the image
if(width < proofreadPageWidth) {
thumb_url =
proofreadPageThumbURL.replace('##WIDTH##',""+width);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71124] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71124
Revision: 71124
Author: jeroendedauw
Date: 2010-08-15 15:13:26 + (Sun, 15 Aug 2010)
Log Message:
---
Added alias file and fixed issue in Special:Update
Modified Paths:
--
trunk/extensions/Deployment/Deployment.php
trunk/extensions/Deployment/specials/SpecialUpdate.php
Added Paths:
---
trunk/extensions/Deployment/Deployment.alias.php
Added: trunk/extensions/Deployment/Deployment.alias.php
===
--- trunk/extensions/Deployment/Deployment.alias.php
(rev 0)
+++ trunk/extensions/Deployment/Deployment.alias.php2010-08-15 15:13:26 UTC
(rev 71124)
@@ -0,0 +1,22 @@
+ array( 'Dashboard' ),
+ 'Extensions' => array( 'Extensions' ),
+ 'Install' => array( 'Install' ),
+ 'Update' => array( 'Update', 'Updates' ),
+);
\ No newline at end of file
Property changes on: trunk/extensions/Deployment/Deployment.alias.php
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/Deployment/Deployment.php
===
--- trunk/extensions/Deployment/Deployment.php 2010-08-15 15:11:58 UTC (rev
71123)
+++ trunk/extensions/Deployment/Deployment.php 2010-08-15 15:13:26 UTC (rev
71124)
@@ -21,8 +21,9 @@
// Register the initialization function.
$wgExtensionFunctions[] = 'efDeploymentSetup';
-// Register the internationalization file.
+// Register the internationalization and aliasing files.
$wgExtensionMessagesFiles['Deployment'] = dirname( __FILE__ ) .
'/Deployment.i18n.php';
+$wgExtensionAliasesFiles['Deployment'] = dirname( __FILE__ ) .
'/Deployment.alias.php';
// Load classes.
$wgAutoloadClasses['ExtensionInfo'] = dirname( __FILE__ ) .
'/includes/ExtensionInfo.php';
Modified: trunk/extensions/Deployment/specials/SpecialUpdate.php
===
--- trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
15:11:58 UTC (rev 71123)
+++ trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
15:13:26 UTC (rev 71124)
@@ -38,14 +38,24 @@
* @param $arg String
*/
public function execute( $arg ) {
- global $wgOut, $wgUser;
+ global $wgOut, $wgUser, $wgVersion, $wgExtensionCredits;
$wgOut->setPageTitle( wfMsg( 'update-title' ) );
// If the user is authorized, display the page, if not, show an
error.
if ( $this->userCanExecute( $wgUser ) ) {
+ $allExtensions = array();
+
+ foreach ( $wgExtensionCredits as $type => $extensions )
{
+ foreach ( $extensions as $extension ) {
+ if ( array_key_exists( 'name',
$extension ) && array_key_exists( 'version', $extension ) ) {
+
$allExtensions[$extension['name']] = $extension['version'];
+ }
+ }
+ }
+
$repository = wfGetRepository();
- $updates = $repository->installationHasUpdates();
+ $updates = $repository->installationHasUpdates(
$wgVersion, $allExtensions );
if ( $updates === false ) {
$this->showCoreStatus( false );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71123] trunk/extensions/Distribution/api/ApiUpdates.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71123 Revision: 71123 Author: jeroendedauw Date: 2010-08-15 15:11:58 + (Sun, 15 Aug 2010) Log Message: --- Fixed issues caused by schema change Modified Paths: -- trunk/extensions/Distribution/api/ApiUpdates.php Modified: trunk/extensions/Distribution/api/ApiUpdates.php === --- trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 15:08:03 UTC (rev 71122) +++ trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 15:11:58 UTC (rev 71123) @@ -140,11 +140,10 @@ array( 'version_id', 'version_nr', - 'version_status', - 'version_url' + 'version_status' ), array( - 'unit_id' => $extension->unit_id, + 'version_unit_id' => $extension->unit_id, 'version_status' => $states ), 'Database::selectRow', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71122] trunk/extensions/Distribution
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71122
Revision: 71122
Author: jeroendedauw
Date: 2010-08-15 15:08:03 + (Sun, 15 Aug 2010)
Log Message:
---
Fixed error that occurred when there is no latest release
Modified Paths:
--
trunk/extensions/Distribution/Distribution.php
trunk/extensions/Distribution/api/ApiUpdates.php
Modified: trunk/extensions/Distribution/Distribution.php
===
--- trunk/extensions/Distribution/Distribution.php 2010-08-15 14:53:28 UTC
(rev 71121)
+++ trunk/extensions/Distribution/Distribution.php 2010-08-15 15:08:03 UTC
(rev 71122)
@@ -22,7 +22,7 @@
// Register the initialization function.
$wgExtensionFunctions[] = 'efDistributionSetup';
-// Register the internationalization file.
+// Register the internationalization and aliasing files.
$wgExtensionMessagesFiles['Distribution'] = dirname( __FILE__ ) .
'/Distribution.i18n.php';
$wgExtensionAliasesFiles['Distribution'] = dirname( __FILE__ ) .
'/Distribution.alias.php';
Modified: trunk/extensions/Distribution/api/ApiUpdates.php
===
--- trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 14:53:28 UTC
(rev 71121)
+++ trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 15:08:03 UTC
(rev 71122)
@@ -85,10 +85,10 @@
* @param $states Array: a list of allowed release states.
*/
protected function checkForCoreUpdates( $mwVersion, array $states ) {
- $coreVersion =
ReleaseRepo::singleton()->getLatestStableRelease()->getNumber();
+ $latestRelease =
ReleaseRepo::singleton()->getLatestStableRelease();
- if ( version_compare( $coreVersion, $mwVersion, '>' ) ) {
- $this->getResult()->addValue( null, 'mediawiki',
$coreVersion );
+ if ( $latestRelease !== false && version_compare(
$latestRelease->getNumber(), $mwVersion, '>' ) ) {
+ $this->getResult()->addValue( null, 'mediawiki',
$latestRelease->getNumber() );
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71121] trunk/extensions/Distribution/Distribution.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71121 Revision: 71121 Author: jeroendedauw Date: 2010-08-15 14:53:28 + (Sun, 15 Aug 2010) Log Message: --- Added forgotten inclusion of the alias file Modified Paths: -- trunk/extensions/Distribution/Distribution.php Modified: trunk/extensions/Distribution/Distribution.php === --- trunk/extensions/Distribution/Distribution.php 2010-08-15 14:52:23 UTC (rev 71120) +++ trunk/extensions/Distribution/Distribution.php 2010-08-15 14:53:28 UTC (rev 71121) @@ -24,6 +24,7 @@ // Register the internationalization file. $wgExtensionMessagesFiles['Distribution'] = dirname( __FILE__ ) . '/Distribution.i18n.php'; +$wgExtensionAliasesFiles['Distribution'] = dirname( __FILE__ ) . '/Distribution.alias.php'; // Load classes. $wgAutoloadClasses['DistributionRelease'] = dirname( __FILE__ ) . '/includes/DistributionRelease.php'; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71120] trunk/extensions/Deployment/specials/SpecialExtensions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71120
Revision: 71120
Author: jeroendedauw
Date: 2010-08-15 14:52:23 + (Sun, 15 Aug 2010)
Log Message:
---
Added TODOs
Modified Paths:
--
trunk/extensions/Deployment/specials/SpecialExtensions.php
Modified: trunk/extensions/Deployment/specials/SpecialExtensions.php
===
--- trunk/extensions/Deployment/specials/SpecialExtensions.php 2010-08-15
14:51:20 UTC (rev 71119)
+++ trunk/extensions/Deployment/specials/SpecialExtensions.php 2010-08-15
14:52:23 UTC (rev 71120)
@@ -253,6 +253,10 @@
protected function displayExtensionRow( ExtensionInfo $extension ) {
global $wgOut;
+ // TODO: use seperate rows for title + desc and controls + links
+
+ // TODO: add row that shows with update info when an update is
detected
+
$wgOut->addHTML( '' );
$wgOut->addHTML( $this->getItemNameTdContents( $extension ) );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71119] trunk/extensions/Deployment/specials/SpecialUpdate.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71119
Revision: 71119
Author: jeroendedauw
Date: 2010-08-15 14:51:20 + (Sun, 15 Aug 2010)
Log Message:
---
Work on Special:Update
Modified Paths:
--
trunk/extensions/Deployment/specials/SpecialUpdate.php
Modified: trunk/extensions/Deployment/specials/SpecialUpdate.php
===
--- trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
14:49:07 UTC (rev 71118)
+++ trunk/extensions/Deployment/specials/SpecialUpdate.php 2010-08-15
14:51:20 UTC (rev 71119)
@@ -44,22 +44,57 @@
// If the user is authorized, display the page, if not, show an
error.
if ( $this->userCanExecute( $wgUser ) ) {
- $this->showCoreStatus();
- $this->showExtensionStatuses();
+ $repository = wfGetRepository();
+ $updates = $repository->installationHasUpdates();
+
+ if ( $updates === false ) {
+ $this->showCoreStatus( false );
+ $this->showExtensionStatuses( false );
+ }
+ else {
+ // Check if there is a MediaWiki update.
+ if ( array_key_exists( 'MediaWiki', $updates )
) {
+ $this->showCoreStatus(
$updates['MediaWiki'] );
+ unset( $updates['MediaWiki'] );
+ }
+ else {
+ $this->showCoreStatus( false );
+ }
+
+ $this->showExtensionStatuses( count( $updates )
> 0 ? $updates : false );
+ }
+
} else {
$this->displayRestrictionError();
}
}
- protected function showCoreStatus() {
- $repository = wfGetRepository();
+ /**
+* Displays messages indicating if the MediaWiki install is up
+* to date or not, and if not, which updates are available.
+*
+* @since 0.1
+*
+* @param $status
+*/
+ protected function showCoreStatus( $status ) {
+ global $wgVersion;
- // TODO
+
}
+ /**
+* Shows a list of extensions that have updates avialable,
+* or a message indicating they are all up to date.
+*
+* @since 0.1
+*
+* @param $status
+*/
protected function showExtensionStatuses() {
- $repository = wfGetRepository();
+ global $wgExtensionCredits;
+
// TODO
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71118] trunk/phase3/maintenance/sqlite/archives/ patch-iw_api_and_wikiid.sql
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71118 Revision: 71118 Author: maxsem Date: 2010-08-15 14:49:07 + (Sun, 15 Aug 2010) Log Message: --- Fixed SQLite updater broken by r69542 Added Paths: --- trunk/phase3/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql Added: trunk/phase3/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql === --- trunk/phase3/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql (rev 0) +++ trunk/phase3/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql 2010-08-15 14:49:07 UTC (rev 71118) @@ -0,0 +1,17 @@ +-- +-- Add iw_api and iw_wikiid to interwiki table +-- + + +CREATE TABLE /*_*/interwiki_tmp ( + iw_prefix TEXT NOT NULL, + iw_url BLOB NOT NULL, + iw_api BLOB NOT NULL, + iw_wikiid TEXT NOT NULL, + iw_local INTEGER NOT NULL, + iw_trans INTEGER NOT NULL default 0 +) /*$wgDBTableOptions*/; + +INSERT INTO /*_*/interwiki_tmp SELECT iw_prefix, iw_url, '', '', iw_local, iw_trans FROM /*_*/interwiki; +DROP TABLE /*_*/interwiki; +ALTER TABLE /*_*/interwiki_tmp RENAME TO /*_*/interwiki; Property changes on: trunk/phase3/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql ___ Added: svn:eol-style + native ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71117] branches/img_metadata/phase3/includes/media
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71117
Revision: 71117
Author: bawolff
Date: 2010-08-15 14:35:01 + (Sun, 15 Aug 2010)
Log Message:
---
Make it so that jpeg's that have no metadata still get versioned
properly, and are seprate from jpeg's that caused an error when
extracting metadata.
Modified Paths:
--
branches/img_metadata/phase3/includes/media/Bitmap.php
branches/img_metadata/phase3/includes/media/Jpeg.php
Modified: branches/img_metadata/phase3/includes/media/Bitmap.php
===
--- branches/img_metadata/phase3/includes/media/Bitmap.php 2010-08-15
13:28:22 UTC (rev 71116)
+++ branches/img_metadata/phase3/includes/media/Bitmap.php 2010-08-15
14:35:01 UTC (rev 71117)
@@ -341,8 +341,19 @@
imagejpeg( $dst_image, $thumbPath, 95 );
}
-
+ /**
+* Its unclear if anything still uses this
+* as jpeg is now in its own subclass.
+*
+* And really each media handler should use a
+* different getMetadata, as the formats aren't
+* all that similar and usually have different
+* metadata needs.
+*
+* @deprected
+*/
function getMetadata( $image, $filename ) {
+ wfDeprected( __METHOD__ );
global $wgShowEXIF;
if( $wgShowEXIF && file_exists( $filename ) ) {
$exif = new Exif( $filename );
@@ -362,6 +373,11 @@
return 'exif';
}
+ /**
+* In practise this is only used by jpegs...
+*
+* It should perhaps be moved to Jpeg.php.
+*/
function isMetadataValid( $image, $metadata ) {
global $wgShowEXIF;
if ( !$wgShowEXIF ) {
@@ -369,7 +385,12 @@
return self::METADATA_GOOD;
}
if ( $metadata === '0' ) {
- # Special value indicating that there is no EXIF data
in the file
+ # Old special value indicating that there is no EXIF
data in the file.
+ # or that there was an error well extracting the
metadata.
+ wfDebug( __METHOD__ . ": back-compat version\n");
+ return self::METADATA_COMPATIBLE;
+ }
+ if ( $metadata === '-1' ) {
return self::METADATA_GOOD;
}
wfSuppressWarnings();
@@ -414,7 +435,7 @@
function formatMetadata( $image ) {
$metadata = $image->getMetadata();
- if ( !$metadata ) {
+ if ( !$metadata || $metadata == '-1' ) {
return false;
}
$exif = unserialize( $metadata );
@@ -422,6 +443,9 @@
return false;
}
unset( $exif['MEDIAWIKI_EXIF_VERSION'] );
+ if ( count( $exif ) == 0 ) {
+ return false;
+ }
return $this->formatMetadataHelper( $exif );
}
Modified: branches/img_metadata/phase3/includes/media/Jpeg.php
===
--- branches/img_metadata/phase3/includes/media/Jpeg.php2010-08-15
13:28:22 UTC (rev 71116)
+++ branches/img_metadata/phase3/includes/media/Jpeg.php2010-08-15
14:35:01 UTC (rev 71117)
@@ -13,19 +13,27 @@
function getMetadata ( $image, $filename ) {
try {
$meta = BitmapMetadataHandler::Jpeg( $filename );
- if ( $meta ) {
- $meta['MEDIAWIKI_EXIF_VERSION'] =
Exif::version();
- return serialize( $meta );
- } else {
- /* FIXME, this should probably be something
else to do versioning
-with older files that say have no exif, but
have xmp */
- return '0';
+ if ( !is_array( $meta ) ) {
+ // This should never happen, but doesn't hurt
to be paranoid.
+ throw new MWException('Metadata array is not an
array');
}
+ $meta['MEDIAWIKI_EXIF_VERSION'] = Exif::version();
+ return serialize( $meta );
}
catch ( MWException $e ) {
// BitmapMetadataHandler throws an exception in certain
exceptional cases like if file does not exist.
wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" );
- return '0';
+
+ /* This used to use 0 for the cases
+* * No metadata in the file
+* * Something is broken in the
[MediaWiki-CVS] SVN: [71116] branches/img_metadata/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71116
Revision: 71116
Author: bawolff
Date: 2010-08-15 13:28:22 + (Sun, 15 Aug 2010)
Log Message:
---
Fixup some stuff, specificly:
*Improve how multilingual metadata fields are shown to user
*Make the metadata box wider, and some other minor css things.
*Make Altitude and GPS data embedded in XMP be handled properly.
*fixup a couple code comments.
Modified Paths:
--
branches/img_metadata/phase3/includes/media/FormatMetadata.php
branches/img_metadata/phase3/includes/media/IPTC.php
branches/img_metadata/phase3/includes/media/Jpeg.php
branches/img_metadata/phase3/includes/media/XMP.php
branches/img_metadata/phase3/includes/media/XMPInfo.php
branches/img_metadata/phase3/includes/media/XMPValidate.php
branches/img_metadata/phase3/languages/messages/MessagesEn.php
branches/img_metadata/phase3/languages/messages/MessagesQqq.php
branches/img_metadata/phase3/maintenance/language/messageTypes.inc
branches/img_metadata/phase3/maintenance/language/messages.inc
branches/img_metadata/phase3/skins/common/shared.css
Modified: branches/img_metadata/phase3/includes/media/FormatMetadata.php
===
--- branches/img_metadata/phase3/includes/media/FormatMetadata.php
2010-08-15 10:51:24 UTC (rev 71115)
+++ branches/img_metadata/phase3/includes/media/FormatMetadata.php
2010-08-15 13:28:22 UTC (rev 71116)
@@ -738,21 +738,61 @@
else {
switch( $type ) {
case 'lang':
- // fixme incomplete
- // should place x-default, content language,
user language
- // first. then the others, hidden by defualt.
- // also should use much better markup.
- $content = "";
- if ( $vals['x-default'] ) {
- $content .= "\n*" . $vals['x-default'];
+ global $wgContLang;
+ // Display default, followed by ContLang,
+ // followed by the rest in no paticular
+ // order.
+
+ // Todo: hide some items if really long list.
+
+ $content = '';
+
+ $cLang = $wgContLang->getCode();
+ $default = false;
+ $defaultLang = false;
+
+ // If default is set, save it for later,
+ // as we don't know if it's equal to
+ // one of the lang codes. (In xmp
+ // you specify the language for a
+ // default property by having both
+ // a default prop, and one in the language
+ // that are identical)
+ if ( isset( $vals['x-default'] ) ) {
+ $defaultItem = $vals['x-default'];
unset( $vals['x-default'] );
}
+ // Do contentLanguage.
+ if ( isset( $vals[$cLang] ) ) {
+ $isDefault = false;
+ if ( $vals[$cLang] === $defaultItem ) {
+ $defaultItem = false;
+ $isDefault = true;
+ }
+ $content .= self::langItem(
+ $vals[$cLang], $cLang,
+$isDefault );
+
+ unset( $vals[$cLang] );
+ }
+
+ // Now do the rest.
foreach ( $vals as $lang => $item ) {
- global $wgContLang;
- $content .= "\n*"
- . "'''$lang''' $item";
+ if ( $item === $defaultItem ) {
+ $defaultLang = $lang;
+ continue;
+ }
+ $content .= self::langItem( $item,
+ $lang );
}
- return $content;
+ if ( $defaultItem !== false ) {
+ $content = se
[MediaWiki-CVS] SVN: [71115] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71115
Revision: 71115
Author: jeroendedauw
Date: 2010-08-15 10:51:24 + (Sun, 15 Aug 2010)
Log Message:
---
Modified the environment check of the core installer to check the current
MediaWiki version to work with the new repository classes.
Modified Paths:
--
trunk/phase3/includes/DistributionRepository.php
trunk/phase3/includes/PackageRepository.php
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/includes/DistributionRepository.php
===
--- trunk/phase3/includes/DistributionRepository.php2010-08-15 10:21:57 UTC
(rev 71114)
+++ trunk/phase3/includes/DistributionRepository.php2010-08-15 10:51:24 UTC
(rev 71115)
@@ -112,7 +112,7 @@
global $wgRepositoryPackageStates;
$currentVersion = urlencode( $currentVersion );
- $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
+ $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
$response = Http::get(
"$this->location?format=json&action=updates&mediawiki=$currentVersion&state=$states",
@@ -134,6 +134,43 @@
}
/**
+* @see PackageRepository::coreHasUpdate
+*
+* @since 1.17
+*/
+ public function getLatestCoreVersion() {
+ global $wgRepositoryPackageStates;
+
+ $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
+
+ // TODO: use $states
+
+ $response = Http::get(
+ "$this->location?format=json&action=mwreleases",
+ 'default',
+ array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
+ );
+
+ if ( $response === false ) {
+ return false;
+ }
+
+ $response = FormatJson::decode( $response );
+
+ $current = false;
+
+ if ( property_exists( $response, 'mwreleases' ) ) {
+ foreach ( $response->mwreleases as $release ) {
+ if ( property_exists( $release, 'current' ) &&
property_exists( $release, 'version') ) {
+ $current = $release->version;
+ }
+ }
+ }
+
+ return $current;
+ }
+
+ /**
* @see PackageRepository::installationHasUpdates
*
* @since 1.17
Modified: trunk/phase3/includes/PackageRepository.php
===
--- trunk/phase3/includes/PackageRepository.php 2010-08-15 10:21:57 UTC (rev
71114)
+++ trunk/phase3/includes/PackageRepository.php 2010-08-15 10:51:24 UTC (rev
71115)
@@ -70,6 +70,15 @@
public abstract function coreHasUpdate( $currentVersion );
/**
+* Returns the latest MediaWiki release, or false when the request
fails.
+*
+* @since 1.17
+*
+* @return Mixed: string or false
+*/
+ public abstract function getLatestCoreVersion();
+
+ /**
* Checks if there are any updates for this MediaWiki installation and
extensions.
*
* @since 1.17
Modified: trunk/phase3/includes/installer/Installer.php
===
--- trunk/phase3/includes/installer/Installer.php 2010-08-15 10:21:57 UTC
(rev 71114)
+++ trunk/phase3/includes/installer/Installer.php 2010-08-15 10:51:24 UTC
(rev 71115)
@@ -383,30 +383,25 @@
public function envLatestVersion() {
global $wgVersion;
- $latestInfoUrl =
'http://www.mediawiki.org/w/api.php?action=mwreleases&format=json';
- $latestInfo = Http::get( $latestInfoUrl );
-
+ $repository = wfGetRepository();
+ $currentVersion = $repository->getLatestCoreVersion();
+
+ /*
if( !$latestInfo ) {
$this->showMessage( 'config-env-latest-can-not-check',
$latestInfoUrl );
return;
}
+ */
$this->setVar( '_ExternalHTTP', true );
- $latestInfo = FormatJson::decode($latestInfo);
- if ($latestInfo === false || !isset( $latestInfo->mwreleases )
) {
+ if ( $currentVersion === false ) {
# For when the request is successful but there's e.g.
some silly man in
# the middle firewall blocking us, e.g. one of those
[MediaWiki-CVS] SVN: [71114] trunk/extensions/LiquidThreads
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71114
Revision: 71114
Author: nikerabbit
Date: 2010-08-15 10:21:57 + (Sun, 15 Aug 2010)
Log Message:
---
* (bug 21903) LiquidThreads namespace names cannot be localised
Modified Paths:
--
trunk/extensions/LiquidThreads/LiquidThreads.php
Added Paths:
---
trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
Modified: trunk/extensions/LiquidThreads/LiquidThreads.php
===
--- trunk/extensions/LiquidThreads/LiquidThreads.php2010-08-15 10:07:05 UTC
(rev 71113)
+++ trunk/extensions/LiquidThreads/LiquidThreads.php2010-08-15 10:21:57 UTC
(rev 71114)
@@ -3,11 +3,11 @@
die();
$wgExtensionCredits['other'][] = array(
- 'path' => __FILE__,
- 'name' => 'Liquid Threads',
- 'version'=> '2.0-alpha',
- 'url'=>
'http://www.mediawiki.org/wiki/Extension:LiquidThreads',
- 'author' => array( 'David McCabe', 'Andrew Garrett' ),
+ 'path' => __FILE__,
+ 'name' => 'Liquid Threads',
+ 'version'=> '2.0-alpha',
+ 'url'=>
'http://www.mediawiki.org/wiki/Extension:LiquidThreads',
+ 'author' => array( 'David McCabe', 'Andrew Garrett' ),
'descriptionmsg' => 'lqt-desc',
);
@@ -21,22 +21,21 @@
define( 'LQT_NEWEST_THREADS', 'nt' );
define( 'LQT_OLDEST_THREADS', 'ot' );
-// FIXME: would be neat if it was possible to somehow localise this.
-$wgCanonicalNamespaceNames[NS_LQT_THREAD] = 'Thread';
-$wgCanonicalNamespaceNames[NS_LQT_THREAD_TALK] = 'Thread_talk';
-$wgCanonicalNamespaceNames[NS_LQT_SUMMARY] = 'Summary';
-$wgCanonicalNamespaceNames[NS_LQT_SUMMARY_TALK] = 'Summary_talk';
+$wgExtensionFunctions[] = 'wgLqtSetupCanonicalNamespces';
-// FIXME: would be neat if it was possible to somehow localise this.
-$wgExtraNamespaces[NS_LQT_THREAD] = 'Thread';
-$wgExtraNamespaces[NS_LQT_THREAD_TALK] = 'Thread_talk';
-$wgExtraNamespaces[NS_LQT_SUMMARY] = 'Summary';
-$wgExtraNamespaces[NS_LQT_SUMMARY_TALK] = 'Summary_talk';
+function wgLqtSetupCanonicalNamespces() {
+ global $wgCanonicalNamespaceNames;
+ $wgCanonicalNamespaceNames[NS_LQT_THREAD] = 'Thread';
+ $wgCanonicalNamespaceNames[NS_LQT_THREAD_TALK] = 'Thread_talk';
+ $wgCanonicalNamespaceNames[NS_LQT_SUMMARY] = 'Summary';
+ $wgCanonicalNamespaceNames[NS_LQT_SUMMARY_TALK] = 'Summary_talk';
+}
// Localisation
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['LiquidThreads'] = $dir . 'i18n/Lqt.i18n.php';
$wgExtensionMessagesFiles['LiquidThreadsMagic'] = $dir .
'i18n/LiquidThreads.magic.php';
+$wgExtensionMessagesFiles['LiquidThreadsNamespaces'] = $dir .
'i18n/Lqt.namespaces.php';
$wgExtensionAliasesFiles['LiquidThreads'] = $dir . 'i18n/Lqt.alias.php';
// Parser Function Setup
Added: trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
===
--- trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php
(rev 0)
+++ trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.php 2010-08-15
10:21:57 UTC (rev 71114)
@@ -0,0 +1,17 @@
+ 'Thread',
+ NS_LQT_THREAD_TALK => 'Thread_talk',
+ NS_LQT_SUMMARY => 'Summary',
+ NS_LQT_SUMMARY_TALK => 'Summary_talk',
+);
+
+$namespaceNames['fi'] = array(
+ NS_LQT_THREAD => 'Viestiketju',
+ NS_LQT_THREAD_TALK => 'Keskustelu_viestiketjusta',
+ NS_LQT_SUMMARY => 'Yhteenveto',
+ NS_LQT_SUMMARY_TALK => 'Keskustelu_yhteenvedosta',
+);
Property changes on: trunk/extensions/LiquidThreads/i18n/Lqt.namespaces.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: [71113] trunk/extensions/Distribution/Distribution.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71113 Revision: 71113 Author: jeroendedauw Date: 2010-08-15 10:07:05 + (Sun, 15 Aug 2010) Log Message: --- Follow up to r71103, tweaked extension credits Modified Paths: -- trunk/extensions/Distribution/Distribution.php Modified: trunk/extensions/Distribution/Distribution.php === --- trunk/extensions/Distribution/Distribution.php 2010-08-15 10:03:40 UTC (rev 71112) +++ trunk/extensions/Distribution/Distribution.php 2010-08-15 10:07:05 UTC (rev 71113) @@ -70,11 +70,10 @@ 'path' => __FILE__, 'name' => 'Distribution', 'version' => Distribution_VERSION, - 'author' => '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw], Chad Horohoe', + 'author' => array( '[http://www.mediawiki.org/wiki/User:Jeroen_De_Dauw Jeroen De Dauw]', 'Chad Horohoe' ), 'url' => 'http://www.mediawiki.org/wiki/Extension:Distribution', 'descriptionmsg' => 'distribution-desc', ); - } /** ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71112] trunk/extensions/Deployment/Deployment_Settings.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71112
Revision: 71112
Author: jeroendedauw
Date: 2010-08-15 10:03:40 + (Sun, 15 Aug 2010)
Log Message:
---
Follow up to r7 - moved forgotten global variables
Modified Paths:
--
trunk/extensions/Deployment/Deployment_Settings.php
Modified: trunk/extensions/Deployment/Deployment_Settings.php
===
--- trunk/extensions/Deployment/Deployment_Settings.php 2010-08-15 10:02:17 UTC
(rev 7)
+++ trunk/extensions/Deployment/Deployment_Settings.php 2010-08-15 10:03:40 UTC
(rev 71112)
@@ -12,16 +12,4 @@
if ( !defined( 'MEDIAWIKI' ) ) {
die( 'Not an entry point.' );
-}
-
-$wgRepositoryLocation = 'http://www.mediawiki.org/wiki/Special:Repository';
-$wgRepositoryApiLocation = 'http://www.mediawiki.org/w/api.php';
-
-$wgRepositoryPackageStates = array(
- //'dev',
- //'alpha',
- 'beta',
- //'rc',
- 'stable',
- //'deprecated',
-);
\ No newline at end of file
+}
\ No newline at end of file
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71111] trunk/phase3/includes/DefaultSettings.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/7 Revision: 7 Author: jeroendedauw Date: 2010-08-15 10:02:17 + (Sun, 15 Aug 2010) Log Message: --- Follow up to r71107 - moved forgotten global variables Modified Paths: -- trunk/phase3/includes/DefaultSettings.php Modified: trunk/phase3/includes/DefaultSettings.php === --- trunk/phase3/includes/DefaultSettings.php 2010-08-15 09:49:22 UTC (rev 71110) +++ trunk/phase3/includes/DefaultSettings.php 2010-08-15 10:02:17 UTC (rev 7) @@ -5088,6 +5088,37 @@ * Enabes or disables JavaScript-based suggestions of password strength */ $wgLivePasswordStrengthChecks = false; + +/** + * The location of the MediaWiki package repository to use. + * + * @since 1.17 + * @var string + */ +$wgRepositoryApiLocation = 'http://www.mediawiki.org/w/api.php'; + +/** + * The location of the remote web interface for the selected repository. + * + * @since 1.17 + * @var string + */ +$wgRepositoryLocation = 'http://www.mediawiki.org/wiki/Special:Repository'; + +/** + * List of package states to filter update detection and extension listing on. + * + * @since 1.17 + * @var array + */ +$wgRepositoryPackageStates = array( + //'dev', + //'alpha', + 'beta', + //'rc', + 'stable', + //'deprecated', +); /** * For really cool vim folding this needs to be at the end: ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71110] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71110
Revision: 71110
Author: jeroendedauw
Date: 2010-08-15 09:49:22 + (Sun, 15 Aug 2010)
Log Message:
---
Follow up to r71107 - added forgotten global function and corrected @since
annotations
Modified Paths:
--
trunk/phase3/includes/DistributionRepository.php
trunk/phase3/includes/GlobalFunctions.php
trunk/phase3/includes/PackageRepository.php
Modified: trunk/phase3/includes/DistributionRepository.php
===
--- trunk/phase3/includes/DistributionRepository.php2010-08-15 09:48:11 UTC
(rev 71109)
+++ trunk/phase3/includes/DistributionRepository.php2010-08-15 09:49:22 UTC
(rev 71110)
@@ -17,7 +17,7 @@
* Repository class for interaction with repositories provided by
* the Distirbution extension and the MediaWiki API.
*
- * @since 0.1
+ * @since 1.17
*
* @ingroup Deployment
*
@@ -30,7 +30,7 @@
*
* @param $location String: path to the api of the MediaWiki install
providing the repository.
*
-* @since 0.1
+* @since 1.17
*/
public function __construct( $location ) {
parent::__construct( $location );
@@ -39,7 +39,7 @@
/**
* @see PackageRepository::findExtenions
*
-* @since 0.1
+* @since 1.17
*
* @param $filterType String
* @param $filterValue String
@@ -75,7 +75,7 @@
/**
* @see PackageRepository::extensionHasUpdate
*
-* @since 0.1
+* @since 1.17
*/
public function extensionHasUpdate( $extensionName, $currentVersion ) {
global $wgRepositoryPackageStates;
@@ -106,7 +106,7 @@
/**
* @see PackageRepository::coreHasUpdate
*
-* @since 0.1
+* @since 1.17
*/
public function coreHasUpdate( $currentVersion ) {
global $wgRepositoryPackageStates;
@@ -136,7 +136,7 @@
/**
* @see PackageRepository::installationHasUpdates
*
-* @since 0.1
+* @since 1.17
*/
public function installationHasUpdates( $coreVersion, array $extensions
) {
global $wgRepositoryPackageStates;
Modified: trunk/phase3/includes/GlobalFunctions.php
===
--- trunk/phase3/includes/GlobalFunctions.php 2010-08-15 09:48:11 UTC (rev
71109)
+++ trunk/phase3/includes/GlobalFunctions.php 2010-08-15 09:49:22 UTC (rev
71110)
@@ -3454,3 +3454,22 @@
}
return $ret;
}
+
+/**
+ * Returns the PackageRepository object for interaction with the package
repository.
+ *
+ * TODO: Make the repository type also configurable.
+ *
+ * @since 1.17
+ *
+ * @return PackageRepository
+ */
+function wfGetRepository() {
+ global $wgRepository, $wgRepositoryApiLocation;
+
+ if ( !isset( $wgRepository ) ) {
+ $wgRepository = new DistributionRepository(
$wgRepositoryApiLocation );
+ }
+
+ return $wgRepository;
+}
\ No newline at end of file
Modified: trunk/phase3/includes/PackageRepository.php
===
--- trunk/phase3/includes/PackageRepository.php 2010-08-15 09:48:11 UTC (rev
71109)
+++ trunk/phase3/includes/PackageRepository.php 2010-08-15 09:49:22 UTC (rev
71110)
@@ -17,7 +17,7 @@
* Base repository class. Deriving classes handle interaction with
* package repositories of the type they support.
*
- * @since 0.1
+ * @since 1.17
*
* @ingroup Deployment
*
@@ -28,7 +28,7 @@
/**
* Base location of the repository.
*
-* @since 0.1
+* @since 1.17
*
* @var string
*/
@@ -37,7 +37,7 @@
/**
* Returns a list of extensions matching the search criteria.
*
-* @since 0.1
+* @since 1.17
*
* @param $filterType String
* @param $filterValue String
@@ -49,7 +49,7 @@
/**
* Checks if newer versions of an extension are available.
*
-* @since 0.1
+* @since 1.17
*
* @param $extensionName String
* @param $currentVersion String
@@ -61,7 +61,7 @@
/**
* Checks if newer versions of MediaWiki is available.
*
-* @since 0.1
+* @since 1.17
*
* @param $currentVersion String
*
@@ -72,7 +72,7 @@
/**
* Checks if there are any updates for this MediaWiki installation and
extensions.
*
-* @since 0.1
+* @since 1.17
*
* @param $coreVersion String
* @param $extensions Array
@@ -86,7 +86,7 @@
*
* @param $location String
*
-* @s
[MediaWiki-CVS] SVN: [71109] trunk/extensions/Deployment/Deployment.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71109
Revision: 71109
Author: jeroendedauw
Date: 2010-08-15 09:48:11 + (Sun, 15 Aug 2010)
Log Message:
---
Follow up to r71107
Modified Paths:
--
trunk/extensions/Deployment/Deployment.php
Modified: trunk/extensions/Deployment/Deployment.php
===
--- trunk/extensions/Deployment/Deployment.php 2010-08-15 09:41:02 UTC (rev
71108)
+++ trunk/extensions/Deployment/Deployment.php 2010-08-15 09:48:11 UTC (rev
71109)
@@ -68,19 +68,4 @@
'descriptionmsg' => 'deployment-desc',
);
-}
-
-/**
- * Returns the PackageRepository object for interaction with the package
repository.
- *
- * @return PackageRepository
- */
-function wfGetRepository() {
- global $wgRepository, $wgRepositoryApiLocation;
-
- if ( !isset( $wgRepository ) ) {
- $wgRepository = new DistributionRepository(
$wgRepositoryApiLocation );
- }
-
- return $wgRepository;
-}
\ No newline at end of file
+}
\ No newline at end of file
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71108] trunk/extensions/Deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71108
Revision: 71108
Author: jeroendedauw
Date: 2010-08-15 09:41:02 + (Sun, 15 Aug 2010)
Log Message:
---
Follow up to r71107
Modified Paths:
--
trunk/extensions/Deployment/Deployment.php
Removed Paths:
-
trunk/extensions/Deployment/includes/DistributionRepository.php
trunk/extensions/Deployment/includes/PackageRepository.php
Modified: trunk/extensions/Deployment/Deployment.php
===
--- trunk/extensions/Deployment/Deployment.php 2010-08-15 09:40:16 UTC (rev
71107)
+++ trunk/extensions/Deployment/Deployment.php 2010-08-15 09:41:02 UTC (rev
71108)
@@ -25,8 +25,6 @@
$wgExtensionMessagesFiles['Deployment'] = dirname( __FILE__ ) .
'/Deployment.i18n.php';
// Load classes.
-$wgAutoloadClasses['PackageRepository'] = dirname( __FILE__ ) .
'/includes/PackageRepository.php';
-$wgAutoloadClasses['DistributionRepository'] = dirname( __FILE__ ) .
'/includes/DistributionRepository.php';
$wgAutoloadClasses['ExtensionInfo'] = dirname( __FILE__ ) .
'/includes/ExtensionInfo.php';
// Load and register Special:Dashboard.
Deleted: trunk/extensions/Deployment/includes/DistributionRepository.php
===
--- trunk/extensions/Deployment/includes/DistributionRepository.php
2010-08-15 09:40:16 UTC (rev 71107)
+++ trunk/extensions/Deployment/includes/DistributionRepository.php
2010-08-15 09:41:02 UTC (rev 71108)
@@ -1,186 +0,0 @@
-location?format=json&action=query&list=extensions&dstfilter=$filterType&dstvalue=$filterValue&dststate=$states",
- 'default',
- array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
- );
-
- $extensions = array();
-
- if ( $response !== false ) {
- $response = FormatJson::decode( $response );
-
- if ( property_exists( $response, 'query' ) &&
property_exists( $response->query, 'extensions' ) ) {
- $extensions = $response->query->extensions;
- }
- }
-
- return $extensions;
- }
-
- /**
-* @see PackageRepository::extensionHasUpdate
-*
-* @since 0.1
-*/
- public function extensionHasUpdate( $extensionName, $currentVersion ) {
- global $wgRepositoryPackageStates;
-
- $extensionName = urlencode( $extensionName );
- $currentVersion = urlencode( $currentVersion );
- $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
-
- $response = Http::get(
-
"$this->location?format=json&action=updates&extensions=$extensionName;$currentVersion&state=$states",
- 'default',
- array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
- );
-
- if ( $response === false ) {
- return false;
- }
-
- $response = FormatJson::decode( $response );
-
- if ( property_exists( $response, 'extensions' ) &&
property_exists( $response->extensions, $extensionName ) ) {
- return $response->extensions->$extensionName;
- }
-
- return false;
- }
-
- /**
-* @see PackageRepository::coreHasUpdate
-*
-* @since 0.1
-*/
- public function coreHasUpdate( $currentVersion ) {
- global $wgRepositoryPackageStates;
-
- $currentVersion = urlencode( $currentVersion );
- $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
-
- $response = Http::get(
-
"$this->location?format=json&action=updates&mediawiki=$currentVersion&state=$states",
- 'default',
- array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
- );
-
- if ( $response === false ) {
- return false;
- }
-
- $response = FormatJson::decode( $response );
-
- if ( property_exists( $response, 'mediawiki' ) ) {
- return $response->mediawiki;
- }
-
- return false;
- }
-
- /**
-* @see PackageRepository::installationHasUpdates
-*
-* @since 0.1
-*/
- public function installationHasUpdates( $coreVersion, array $extensions
) {
- gl
[MediaWiki-CVS] SVN: [71107] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71107
Revision: 71107
Author: jeroendedauw
Date: 2010-08-15 09:40:16 + (Sun, 15 Aug 2010)
Log Message:
---
Moved in repository interaction classes from Deployment so it's possible to use
them in the new installer for update detection
Modified Paths:
--
trunk/phase3/includes/AutoLoader.php
Added Paths:
---
trunk/phase3/includes/DistributionRepository.php
trunk/phase3/includes/PackageRepository.php
Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2010-08-15 09:28:26 UTC (rev
71106)
+++ trunk/phase3/includes/AutoLoader.php2010-08-15 09:40:16 UTC (rev
71107)
@@ -55,6 +55,7 @@
'DBABagOStuff' => 'includes/BagOStuff.php',
'DependencyWrapper' => 'includes/CacheDependency.php',
'DiffHistoryBlob' => 'includes/HistoryBlob.php',
+ 'DistributionRepository' => 'includes/DistributionRepository.php',
'DjVuImage' => 'includes/DjVuImage.php',
'DoubleReplacer' => 'includes/StringUtils.php',
'DublinCoreRdf' => 'includes/Metadata.php',
@@ -168,6 +169,7 @@
'MWNamespace' => 'includes/Namespace.php',
'OldChangesList' => 'includes/ChangesList.php',
'OutputPage' => 'includes/OutputPage.php',
+ 'PackageRepository' => 'includes/PackageRepository.php',
'PageQueryPage' => 'includes/PageQueryPage.php',
'PageHistory' => 'includes/HistoryPage.php',
'PageHistoryPager' => 'includes/HistoryPage.php',
Added: trunk/phase3/includes/DistributionRepository.php
===
--- trunk/phase3/includes/DistributionRepository.php
(rev 0)
+++ trunk/phase3/includes/DistributionRepository.php2010-08-15 09:40:16 UTC
(rev 71107)
@@ -0,0 +1,186 @@
+location?format=json&action=query&list=extensions&dstfilter=$filterType&dstvalue=$filterValue&dststate=$states",
+ 'default',
+ array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
+ );
+
+ $extensions = array();
+
+ if ( $response !== false ) {
+ $response = FormatJson::decode( $response );
+
+ if ( property_exists( $response, 'query' ) &&
property_exists( $response->query, 'extensions' ) ) {
+ $extensions = $response->query->extensions;
+ }
+ }
+
+ return $extensions;
+ }
+
+ /**
+* @see PackageRepository::extensionHasUpdate
+*
+* @since 0.1
+*/
+ public function extensionHasUpdate( $extensionName, $currentVersion ) {
+ global $wgRepositoryPackageStates;
+
+ $extensionName = urlencode( $extensionName );
+ $currentVersion = urlencode( $currentVersion );
+ $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
+
+ $response = Http::get(
+
"$this->location?format=json&action=updates&extensions=$extensionName;$currentVersion&state=$states",
+ 'default',
+ array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
+ );
+
+ if ( $response === false ) {
+ return false;
+ }
+
+ $response = FormatJson::decode( $response );
+
+ if ( property_exists( $response, 'extensions' ) &&
property_exists( $response->extensions, $extensionName ) ) {
+ return $response->extensions->$extensionName;
+ }
+
+ return false;
+ }
+
+ /**
+* @see PackageRepository::coreHasUpdate
+*
+* @since 0.1
+*/
+ public function coreHasUpdate( $currentVersion ) {
+ global $wgRepositoryPackageStates;
+
+ $currentVersion = urlencode( $currentVersion );
+ $states = urlencode( implode( '|', $wgRepositoryPackageStates )
);
+
+ $response = Http::get(
+
"$this->location?format=json&action=updates&mediawiki=$currentVersion&state=$states",
+ 'default',
+ array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
+ );
+
+ if ( $response === false ) {
+ return false;
+ }
+
+ $response = FormatJson::decode( $response );
+
+ if ( property_exists( $response, 'mediawiki' ) ) {
+
[MediaWiki-CVS] SVN: [71106] trunk/extensions/Deployment/includes/DistributionRepository. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71106
Revision: 71106
Author: jeroendedauw
Date: 2010-08-15 09:28:26 + (Sun, 15 Aug 2010)
Log Message:
---
Fixed small issue that occurred for installs without any extensions
Modified Paths:
--
trunk/extensions/Deployment/includes/DistributionRepository.php
Modified: trunk/extensions/Deployment/includes/DistributionRepository.php
===
--- trunk/extensions/Deployment/includes/DistributionRepository.php
2010-08-15 09:20:32 UTC (rev 71105)
+++ trunk/extensions/Deployment/includes/DistributionRepository.php
2010-08-15 09:28:26 UTC (rev 71106)
@@ -146,14 +146,16 @@
$extensionParams = array();
- foreach ( $extensions as $extensionName => $extensionVersion ) {
- $extensionParams[] = urlencode( $extensionName ) . ';'
. urlencode( $extensionVersion );
+ if ( count( $extensions ) > 0 ) {
+ foreach ( $extensions as $extensionName =>
$extensionVersion ) {
+ $extensionParams[] = urlencode( $extensionName
) . ';' . urlencode( $extensionVersion );
+ }
+
+ $extensionParams = '&extensions=' . urlencode( implode(
'|', $extensionParams ) );
}
-
- $extensionParams = urlencode( implode( '|', $extensionParams )
);
-
+
$response = Http::get(
-
"$this->location?format=json&action=updates&mediawiki=$coreVersion&extensions=$extensionParams&state=$states",
+
"$this->location?format=json&action=updates&mediawiki=$coreVersion{$extensionParams}&state=$states",
'default',
array( 'sslVerifyHost' => true, 'sslVerifyCert' => true
)
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71105] trunk/extensions/Distribution/api/ApiUpdates.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71105
Revision: 71105
Author: jeroendedauw
Date: 2010-08-15 09:20:32 + (Sun, 15 Aug 2010)
Log Message:
---
Follow up to r71103
Modified Paths:
--
trunk/extensions/Distribution/api/ApiUpdates.php
Modified: trunk/extensions/Distribution/api/ApiUpdates.php
===
--- trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 09:02:23 UTC
(rev 71104)
+++ trunk/extensions/Distribution/api/ApiUpdates.php2010-08-15 09:20:32 UTC
(rev 71105)
@@ -85,7 +85,11 @@
* @param $states Array: a list of allowed release states.
*/
protected function checkForCoreUpdates( $mwVersion, array $states ) {
- // TODO: merge with MWReleases here?
+ $coreVersion =
ReleaseRepo::singleton()->getLatestStableRelease()->getNumber();
+
+ if ( version_compare( $coreVersion, $mwVersion, '>' ) ) {
+ $this->getResult()->addValue( null, 'mediawiki',
$coreVersion );
+ }
}
/**
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71104] trunk/extensions/Validator/Validator.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71104
Revision: 71104
Author: jeroendedauw
Date: 2010-08-15 09:02:23 + (Sun, 15 Aug 2010)
Log Message:
---
Small i18n fix
Modified Paths:
--
trunk/extensions/Validator/Validator.i18n.php
Modified: trunk/extensions/Validator/Validator.i18n.php
===
--- trunk/extensions/Validator/Validator.i18n.php 2010-08-15 08:49:35 UTC
(rev 71103)
+++ trunk/extensions/Validator/Validator.i18n.php 2010-08-15 09:02:23 UTC
(rev 71104)
@@ -15,7 +15,7 @@
* @author Jeroen De Dauw
*/
$messages['en'] = array(
- 'validator-desc' => 'Provides generic parameter handling support to
other extensions',
+ 'validator-desc' => 'Provides generic parameter handling support for
other extensions',
'validator_error_parameters' => 'The following {{PLURAL:$1|error
has|errors have}} been detected in your syntax:',
'validator_warning_parameters' => 'There {{PLURAL:$1|is an error|are
errors}} in your syntax.',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71103] trunk/extensions/Distribution
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71103
Revision: 71103
Author: jeroendedauw
Date: 2010-08-15 08:49:35 + (Sun, 15 Aug 2010)
Log Message:
---
Merged in the new MWReleases code
Modified Paths:
--
trunk/extensions/Distribution/Distribution.i18n.php
trunk/extensions/Distribution/Distribution.php
trunk/extensions/Distribution/Distribution_Settings.php
trunk/extensions/Distribution/api/ApiExtensionVersions.php
trunk/extensions/Distribution/api/ApiQueryExtensions.php
trunk/extensions/Distribution/api/ApiQueryPackages.php
trunk/extensions/Distribution/api/ApiUpdates.php
trunk/extensions/Distribution/distribution.sql
Added Paths:
---
trunk/extensions/Distribution/Distribution.alias.php
trunk/extensions/Distribution/api/ApiMWReleases.php
trunk/extensions/Distribution/includes/Release.php
trunk/extensions/Distribution/includes/ReleaseRepo.php
trunk/extensions/Distribution/specials/
trunk/extensions/Distribution/specials/SpecialDownloadMediawiki.php
trunk/extensions/Distribution/specials/SpecialReleaseManager.php
Removed Paths:
-
trunk/extensions/Distribution/TODO
Added: trunk/extensions/Distribution/Distribution.alias.php
===
--- trunk/extensions/Distribution/Distribution.alias.php
(rev 0)
+++ trunk/extensions/Distribution/Distribution.alias.php2010-08-15
08:49:35 UTC (rev 71103)
@@ -0,0 +1,20 @@
+ array( 'ReleaseManager' ),
+ 'DownloadMediaWiki' => array( 'DownloadMediaWiki' ),
+);
Property changes on: trunk/extensions/Distribution/Distribution.alias.php
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/Distribution/Distribution.i18n.php
===
--- trunk/extensions/Distribution/Distribution.i18n.php 2010-08-15 08:23:30 UTC
(rev 71102)
+++ trunk/extensions/Distribution/Distribution.i18n.php 2010-08-15 08:49:35 UTC
(rev 71103)
@@ -6,6 +6,7 @@
* @file Distribution.i18n.php
* @ingroup Distribution
*
+ * @author Chad Horohoe
* @author Jeroen De Dauw
*/
@@ -17,4 +18,22 @@
$messages['en'] = array(
// General
'distribution-desc' => 'Extension that serves as a package distribution
system for MediaWiki and extensions',
+
+ 'mwr-desc' => 'Manages releases of the MediaWiki software',
+ 'releasemanager' => 'MediaWiki release manager',
+ 'releasemanager-header' => 'Welcome to the MediaWiki release manager.
Use the options below to manage the releases',
+ 'releasemanager-add' => 'Add new release',
+ 'releasemanager-supported-til-eol' => 'Supported until EOL date,
currently: $1', // $1 is yes/no
+ 'releasemanager-supported-overriden' => 'Support overridden, currently:
$1', // $1 is yes/no
+ 'releasemanager-doesnotexist' => 'The specified release does not exist',
+ 'releasemanager-delete-confirm' => 'Are you sure you want to delete
this release?',
+ 'downloadmediawiki' => 'Download MediaWiki',
+ 'mwr-field-name' => 'Name',
+ 'mwr-field-number' => 'Number',
+ 'mwr-field-eoldate' => 'End of life date',
+ 'mwr-field-reldate' => 'Release date',
+ 'mwr-field-announcement' => 'Announcement URL',
+ 'mwr-field-supported' => 'Supported flag',
+ 'mwr-field-tag' => 'Tag name',
+ 'mwr-field-branch' => 'Branch name',
);
Modified: trunk/extensions/Distribution/Distribution.php
===
--- trunk/extensions/Distribution/Distribution.php 2010-08-15 08:23:30 UTC
(rev 71102)
+++ trunk/extensions/Distribution/Distribution.php 2010-08-15 08:49:35 UTC
(rev 71103)
@@ -8,6 +8,7 @@
* @ingroup Distribution
*
* @author Jeroen De Dauw
+ * @author Chad Horohoe
*/
if ( !defined( 'MEDIAWIKI' ) ) {
@@ -27,11 +28,21 @@
// Load classes.
$wgAutoloadClasses['DistributionRelease'] = dirname( __FILE__ ) .
'/includes/DistributionRelease.php';
$wgAutoloadClasses['ExtensionDataImporter'] = dirname( __FILE__ ) .
'/includes/ExtensionDataImporter.php';
+$wgAutoloadClasses['ReleaseRepo'] = dirname( __FILE__ ) .
'/includes/ReleaseRepo.php';
+// $wgAutoloadClasses['Release'] = dirname( __FILE__ ) .
'/includes/Release.php';
+$wgAutoloadClasses['MediaWikiRelease'] = dirname( __FILE__ ) .
'/includes/Release.php';
-// Hook registration.
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'efDistributionSchemaUpdate';
+// Special pages.
+$wgAutoloadClasses['SpecialDownloadMediaWiki'] = dirname( __FILE__ ) .
'/specials/SpecialDownloadMediawiki.php';
+$wgSpecialPages['DownloadMediaWiki'] = 'SpecialDownloadMediaWiki';
+$wgAutoloadClasses['SpecialReleaseManager'] = dirname( __FILE__ ) .
'/specials/SpecialReleaseManager.php';
+$wgSpecialPages['ReleaseManager'] = 'SpecialReleaseM
[MediaWiki-CVS] SVN: [71102] trunk/extensions/Deployment/Deployment.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71102 Revision: 71102 Author: jeroendedauw Date: 2010-08-15 08:23:30 + (Sun, 15 Aug 2010) Log Message: --- Small i18n fix Modified Paths: -- trunk/extensions/Deployment/Deployment.i18n.php Modified: trunk/extensions/Deployment/Deployment.i18n.php === --- trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 07:47:23 UTC (rev 71101) +++ trunk/extensions/Deployment/Deployment.i18n.php 2010-08-15 08:23:30 UTC (rev 71102) @@ -55,7 +55,7 @@ 'add-new-extensions' => 'Add new', 'extension-type-all' => 'All', 'extension-bulk-actions' => 'Bulk Actions', - 'extension-page-explanation' => 'This page lists the installed extensions on this wiki. For more info about this wiki installation, see [$1 Special:Version].', + 'extension-page-explanation' => 'This page lists the installed extensions on this wiki. For more info about this wiki installation, see [[Special:Version]].', 'extension-none-installed' => 'There are currently no extensions installed. You can [[$1|add new ones]].', 'extension-empty-category' => 'There are no extensions of type \'\'$1\'\' installed.', 'extension-invalid-category' => 'Could not filter on extension type \'\'$1\'\', all extenions are shown instead.', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71100] trunk/extensions/MWReleases/ui/SpecialReleaseManager.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71100
Revision: 71100
Author: ialex
Date: 2010-08-15 07:25:33 + (Sun, 15 Aug 2010)
Log Message:
---
* SpecialPage::getTitleFor() is a static method; use SpecialPage::getTitle()
which is dynamic and doesn't require page's name
* wfMsg() -> wfMsgHtml() for the text passed to Linker::link() since it won't
be escaped by the latter method
Modified Paths:
--
trunk/extensions/MWReleases/ui/SpecialReleaseManager.php
Modified: trunk/extensions/MWReleases/ui/SpecialReleaseManager.php
===
--- trunk/extensions/MWReleases/ui/SpecialReleaseManager.php2010-08-15
07:16:58 UTC (rev 71099)
+++ trunk/extensions/MWReleases/ui/SpecialReleaseManager.php2010-08-15
07:25:33 UTC (rev 71100)
@@ -56,8 +56,8 @@
$this->out->addWikiMsg( 'releasemanager-header' );
$h = Html::openElement( 'div', array( 'style' =>
'text-align:center' ) ) .
$this->skin->link(
- $this->getTitleFor( 'ReleaseManager', 'add' ),
- wfMsg( 'releasemanager-add' ),
+ $this->getTitle( 'add' ),
+ wfMsgHtml( 'releasemanager-add' ),
array( 'style' => 'font-size:175%' )
) . Html::element( 'hr' ) . Html::closeElement( 'div' )
.
Html::openElement( 'table', array( 'class' =>
'wikitable plainlinks sortable' ) ) .
@@ -86,11 +86,11 @@
wfMsg( 'releasemanager-supported-overriden', $supported
) :
wfMsg( 'releasemanager-supported-til-eol', $supported );
$editDel = $this->skin->link(
- $this->getTitleFor( 'ReleaseManager', 'edit/' .
$rel->getId() ),
- wfMsg( 'edit' )
+ $this->getTitle( 'edit/' . $rel->getId() ),
+ wfMsgHtml( 'edit' )
) . ' / ' . $this->skin->link(
- $this->getTitleFor( 'ReleaseManager', 'delete/' .
$rel->getId() ),
- wfMsg( 'delete' )
+ $this->getTitle( 'delete/' . $rel->getId() ),
+ wfMsgHtml( 'delete' )
);
return Html::openElement( 'tr' ) .
Html::element( 'td', array(), $rel->getName() ) .
@@ -123,7 +123,7 @@
$this->out->addWikiMsg( 'releasemanager-doesnotexist' );
return;
} else {
- $submitUrl = $this->getTitleFor( 'ReleaseManager',
"delete/$versionId" )->getFullURL();
+ $submitUrl = $this->getTitle( "delete/$versionId"
)->getFullURL();
$this->out->addWikiMsg( 'releasemanager-delete-confirm'
);
$h = Html::openElement( 'form', array( 'action' =>
$submitUrl,
'method' => 'post' ) ) .
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [71098] trunk/phase3/includes/Pager.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71098
Revision: 71098
Author: maxsem
Date: 2010-08-15 07:03:59 + (Sun, 15 Aug 2010)
Log Message:
---
Fixed E_STRICT from r71059
Modified Paths:
--
trunk/phase3/includes/Pager.php
Modified: trunk/phase3/includes/Pager.php
===
--- trunk/phase3/includes/Pager.php 2010-08-15 06:31:29 UTC (rev 71097)
+++ trunk/phase3/includes/Pager.php 2010-08-15 07:03:59 UTC (rev 71098)
@@ -195,7 +195,8 @@
$numRows = $res->numRows();
if ( $numRows ) {
# Remove any table prefix from index field
- $indexColumn = end( explode( '.', $this->mIndexField )
);
+ $parts = explode( '.', $this->mIndexField );
+ $indexColumn = end( $parts );
$row = $res->fetchRow();
$firstIndex = $row[$indexColumn];
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
