http://www.mediawiki.org/wiki/Special:Code/MediaWiki/81413
Revision: 81413
Author: catrope
Date: 2011-02-02 20:45:32 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
1.17: MFT r78395, r79968, r81311, r81313, r81349, r81352, r81376, r81389,
r81397, r81399, r81412 (which is really a merge of r80947)
Modified Paths:
--------------
branches/REL1_17/extensions/ClickTracking/ApiClickTracking.php
branches/REL1_17/extensions/ClickTracking/ClickTracking.hooks.php
branches/REL1_17/extensions/CodeReview/ui/CodeRevisionListView.php
branches/REL1_17/extensions/FlvHandler/FlvHandler.i18n.php
branches/REL1_17/extensions/OggHandler/OggHandler.i18n.php
branches/REL1_17/extensions/PagedTiffHandler/PagedTiffHandler.i18n.php
branches/REL1_17/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
branches/REL1_17/extensions/UserDailyContribs/UserDailyContribs.php
branches/REL1_17/extensions/WikiAtHome/WikiAtHome.i18n.php
branches/REL1_17/phase3/includes/DefaultSettings.php
branches/REL1_17/phase3/includes/HTMLForm.php
branches/REL1_17/phase3/includes/ImagePage.php
branches/REL1_17/phase3/includes/Pager.php
branches/REL1_17/phase3/includes/Revision.php
branches/REL1_17/phase3/includes/installer/MysqlUpdater.php
branches/REL1_17/phase3/includes/specials/SpecialSearch.php
Added Paths:
-----------
branches/REL1_17/phase3/maintenance/archives/patch-langlinks-ll_lang-20.sql
Property Changed:
----------------
branches/REL1_17/phase3/includes/DefaultSettings.php
branches/REL1_17/phase3/includes/HTMLForm.php
branches/REL1_17/phase3/includes/Revision.php
branches/REL1_17/phase3/includes/installer/MysqlUpdater.php
branches/REL1_17/phase3/includes/specials/SpecialSearch.php
Modified: branches/REL1_17/extensions/ClickTracking/ApiClickTracking.php
===================================================================
--- branches/REL1_17/extensions/ClickTracking/ApiClickTracking.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/ClickTracking/ApiClickTracking.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -39,13 +39,13 @@
$isLoggedIn = $wgUser->isLoggedIn();
$now = time();
$granularity1 = $isLoggedIn ?
- ClickTrackingHooks::getEditCountSince( $now -
$wgClickTrackContribGranularity1 ) : 0;
+ getUserEditCountSince( $now -
$wgClickTrackContribGranularity1 ) : 0;
$granularity2 = $isLoggedIn ?
- ClickTrackingHooks::getEditCountSince( $now -
$wgClickTrackContribGranularity2 ) : 0;
+ getUserEditCountSince( $now -
$wgClickTrackContribGranularity2 ) : 0;
$granularity3 = $isLoggedIn ?
- ClickTrackingHooks::getEditCountSince( $now -
$wgClickTrackContribGranularity3 ) : 0;
+ getUserEditCountSince( $now -
$wgClickTrackContribGranularity3 ) : 0;
ClickTrackingHooks::trackEvent(
$sessionId, // randomly generated session ID
Modified: branches/REL1_17/extensions/ClickTracking/ClickTracking.hooks.php
===================================================================
--- branches/REL1_17/extensions/ClickTracking/ClickTracking.hooks.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/ClickTracking/ClickTracking.hooks.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -87,28 +87,6 @@
}
/**
- * Get the number of revisions a user has made since a given time
- *
- * @param $ts beginning timestamp
- * @return number of revsions this user has made
- */
- public static function getEditCountSince( $ts ) {
- global $wgUser;
-
- // Convert to just the day
- $time = gmdate( 'Y-m-d', wfTimestamp( TS_UNIX, $ts ) );
- $dbr = wfGetDB( DB_SLAVE );
- $edits = $dbr->selectField(
- 'user_daily_contribs',
- 'SUM(contribs)',
- array( 'user_id' => $wgUser->getId(), 'day >= ' .
$dbr->addQuotes( $time ) ),
- __METHOD__
- );
- // User hasn't made any edits in whatever amount of time
- return $edits == null ? 0 : $edits;
- }
-
- /**
* Get event ID from name
*
* @param $event_name String: name of the event to get
Modified: branches/REL1_17/extensions/CodeReview/ui/CodeRevisionListView.php
===================================================================
--- branches/REL1_17/extensions/CodeReview/ui/CodeRevisionListView.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/CodeReview/ui/CodeRevisionListView.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -31,13 +31,13 @@
// Check for batch change requests.
$editToken = $wgRequest->getVal( 'wpBatchChangeEditToken' );
- if ( $wgRequest->wasPosted() && $wgUser->matchEditToken(
$editToken ) ) {
+ $revisions = $wgRequest->getArray( 'wpRevisionSelected' );
+ if ( $wgRequest->wasPosted() && count( $revisions ) &&
$wgUser->matchEditToken( $editToken ) ) {
$this->doBatchChange();
return;
}
$pathForm = $this->showForm();
- $wgOut->addHTML( $pathForm );
// Get the total count across all pages
$dbr = wfGetDB( DB_SLAVE );
@@ -50,20 +50,23 @@
$wgUser->isAllowed( 'codereview-add-tag' );
$navBar = $pager->getNavigationBar();
- $limitForm = $pager->getLimitForm();
+ $wgOut->addHTML( $pathForm );
+
$wgOut->addHTML(
$navBar .
- '<table><tr><td>' . $limitForm . '</td>' .
+ '<table><tr><td>' . $pager->getLimitForm() . '</td>' .
'<td> <strong>' . wfMsgHtml( 'code-rev-total',
$wgLang->formatNum( $revCount ) ) . '</strong></td>' .
'</tr></table>' .
Xml::openElement( 'form',
array( 'action' =>
$pager->getTitle()->getLocalURL(), 'method' => 'post' )
) .
$pager->getBody() .
- $limitForm .
+ //$pager->getLimitDropdown() .
$navBar .
- ( $this->batchForm ? $this->buildBatchInterface( $pager
) : "" ) .
+ ( $this->batchForm ?
+ $this->buildBatchInterface( $pager )
+ : "" ) .
Xml::closeElement( 'form' )
);
@@ -175,7 +178,7 @@
} else {
$ret .= Html::hidden( 'title',
$special->getPrefixedDBKey() ) ;
}
- $ret .= "</tr></table></fieldset>" ;
+ $ret .= "</tr></table></fieldset></form>" ;
return $ret;
}
@@ -358,4 +361,3 @@
return SpecialPage::getTitleFor( 'Code',
$this->mRepo->getName() );
}
}
-
Modified: branches/REL1_17/extensions/FlvHandler/FlvHandler.i18n.php
===================================================================
--- branches/REL1_17/extensions/FlvHandler/FlvHandler.i18n.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/FlvHandler/FlvHandler.i18n.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -13,7 +13,7 @@
*/
$messages['en'] = array(
'flvhandler_desc' => 'Allow Flash Video (.flv) files to be added as
standard files (e.g.
<nowiki>[[</nowiki>{{ns:file}}:Movie.flv<nowiki>]]</nowiki>)',
- 'flv-long-desc' => '(Flash Video, $1 × $2 pixels, file size: $3)'
+ 'flv-long-desc' => 'Flash Video, $1 × $2 pixels, file size: $3'
);
/** Message documentation (Message documentation)
Modified: branches/REL1_17/extensions/OggHandler/OggHandler.i18n.php
===================================================================
--- branches/REL1_17/extensions/OggHandler/OggHandler.i18n.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/OggHandler/OggHandler.i18n.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -13,11 +13,11 @@
'ogg-short-audio' => 'Ogg $1 sound file, $2',
'ogg-short-video' => 'Ogg $1 video file, $2',
'ogg-short-general' => 'Ogg $1 media file, $2',
- 'ogg-long-audio' => '(Ogg $1 sound file, length $2, $3)',
- 'ogg-long-video' => '(Ogg $1 video file, length $2, $4×$5 pixels,
$3)',
- 'ogg-long-multiplexed' => '(Ogg multiplexed audio/video file, $1,
length $2, $4×$5 pixels, $3 overall)',
- 'ogg-long-general' => '(Ogg media file, length $2, $3)',
- 'ogg-long-error' => '(Invalid ogg file: $1)',
+ 'ogg-long-audio' => 'Ogg $1 sound file, length $2, $3',
+ 'ogg-long-video' => 'Ogg $1 video file, length $2, $4×$5 pixels,
$3',
+ 'ogg-long-multiplexed' => 'Ogg multiplexed audio/video file, $1, length
$2, $4×$5 pixels, $3 overall',
+ 'ogg-long-general' => 'Ogg media file, length $2, $3',
+ 'ogg-long-error' => 'Invalid ogg file: $1',
'ogg-play' => 'Play',
'ogg-pause' => 'Pause',
'ogg-stop' => 'Stop',
Modified: branches/REL1_17/extensions/PagedTiffHandler/PagedTiffHandler.i18n.php
===================================================================
--- branches/REL1_17/extensions/PagedTiffHandler/PagedTiffHandler.i18n.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/PagedTiffHandler/PagedTiffHandler.i18n.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -28,7 +28,7 @@
'tiff_size_error' => 'The reported file size does not match the actual
file size.',
'tiff_script_detected' => 'The uploaded file contains scripts.',
'tiff_bad_file' => 'The uploaded file contains errors: $1',
- 'tiff-file-info-size' => '(page $5, $1 × $2 pixel, file size: $3, MIME
type: $4)',
+ 'tiff-file-info-size' => 'page $5, $1 × $2 pixel, file size: $3, MIME
type: $4',
);
/** Message documentation (Message documentation)
Modified:
branches/REL1_17/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
===================================================================
--- branches/REL1_17/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -13,11 +13,11 @@
'timedmedia-short-audio' => 'Ogg $1 sound file, $2',
'timedmedia-short-video' => 'Ogg $1 video file, $2',
'timedmedia-short-general' => 'Ogg $1 media file, $2',
- 'timedmedia-long-audio' => '(Ogg $1 sound file, length $2, $3)',
- 'timedmedia-long-video' => '(Ogg $1 video file, length $2, $4×$5
pixels, $3)',
- 'timedmedia-long-multiplexed' => '(Ogg multiplexed audio/video file,
$1, length $2, $4×$5 pixels, $3 overall)',
- 'timedmedia-long-general' => '(Ogg media file, length $2, $3)',
- 'timedmedia-long-error' => '(Invalid Ogg file: $1)',
+ 'timedmedia-long-audio' => 'Ogg $1 sound file, length $2, $3',
+ 'timedmedia-long-video' => 'Ogg $1 video file, length $2, $4×$5
pixels, $3',
+ 'timedmedia-long-multiplexed' => 'Ogg multiplexed audio/video file, $1,
length $2, $4×$5 pixels, $3 overall',
+ 'timedmedia-long-general' => 'Ogg media file, length $2, $3',
+ 'timedmedia-long-error' => 'Invalid Ogg file: $1',
'timedmedia-no-player-js' => 'Sorry, your browser either has
JavaScript disabled or does not have any supported player.<br />
You can <a href="$1">download the clip</a> or <a
href="http://www.mediawiki.org/wiki/Extension:OggHandler/Client_download";>download
a player</a> to play the clip in your browser.',
Modified: branches/REL1_17/extensions/UserDailyContribs/UserDailyContribs.php
===================================================================
--- branches/REL1_17/extensions/UserDailyContribs/UserDailyContribs.php
2011-02-02 20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/UserDailyContribs/UserDailyContribs.php
2011-02-02 20:45:32 UTC (rev 81413)
@@ -28,3 +28,30 @@
$wgHooks['LoadExtensionSchemaUpdates'][] =
'UserDailyContribsHooks::loadExtensionSchemaUpdates';
$wgHooks['ArticleSaveComplete'][] =
'UserDailyContribsHooks::articleSaveComplete';
$wgHooks['ParserTestTables'][] = 'UserDailyContribsHooks::parserTestTables';
+
+/**
+ * Get the number of revisions a user has made since a given time
+ *
+ * @param $time beginning timestamp
+ * @return number of revsions this user has made
+ */
+function getUserEditCountSince( $time = null, User $user = null ) {
+ global $wgUser;
+
+ // Fallback on current user
+ if ( is_null( $user ) ) {
+ $user = $wgUser;
+ }
+ // Round time down to a whole day
+ $time = gmdate( 'Y-m-d', wfTimestamp( TS_UNIX, $time ) );
+ // Query the user contribs table
+ $dbr = wfGetDB( DB_SLAVE );
+ $edits = $dbr->selectField(
+ 'user_daily_contribs',
+ 'SUM(contribs)',
+ array( 'user_id' => $user->getId(), 'day >= ' .
$dbr->addQuotes( $time ) ),
+ __METHOD__
+ );
+ // Return edit count as an integer
+ return is_null( $edits ) ? 0 : (integer) $edits;
+}
Modified: branches/REL1_17/extensions/WikiAtHome/WikiAtHome.i18n.php
===================================================================
--- branches/REL1_17/extensions/WikiAtHome/WikiAtHome.i18n.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/extensions/WikiAtHome/WikiAtHome.i18n.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -20,11 +20,11 @@
'wah-short-video' => '$1 video file, $2',
'wah-short-general' => '$1 media file, $2',
- 'wah-long-audio' => '($1 sound file, length $2, $3)',
- 'wah-long-video' => '($1 video file, length $2, $4×$5 pixels, $3)',
- 'wah-long-multiplexed' => '(multiplexed audio/video file, $1, length
$2, $4×$5 pixels, $3 overall)',
- 'wah-long-general' => '(media file, length $2, $3)',
- 'wah-long-error' => '(ffmpeg could not read this file: $1)',
+ 'wah-long-audio' => '$1 sound file, length $2, $3',
+ 'wah-long-video' => '$1 video file, length $2, $4×$5 pixels, $3',
+ 'wah-long-multiplexed' => 'multiplexed audio/video file, $1, length $2,
$4×$5 pixels, $3 overall',
+ 'wah-long-general' => 'media file, length $2, $3',
+ 'wah-long-error' => 'ffmpeg could not read this file: $1',
'wah-transcode-working' => 'This video is being processed, please try
again later',
'wah-transcode-helpout' => 'You can help transcode this video by
visiting [[Special:WikiAtHome|Wiki@Home]].',
Modified: branches/REL1_17/phase3/includes/DefaultSettings.php
===================================================================
--- branches/REL1_17/phase3/includes/DefaultSettings.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/phase3/includes/DefaultSettings.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -539,9 +539,16 @@
# A ZIP file may be a valid Java archive containing an applet which
exploits the
# same-origin policy to steal cookies
'application/zip',
+
# MS Office OpenXML and other Open Package Conventions files are zip
files
- # and thus blacklisted just as other zip files
+ # and thus blacklisted just as other zip files. If you remove these
entries
+ # from the blacklist in your local configuration, a malicious file
upload
+ # will be able to compromise the wiki's user accounts, and the user
+ # accounts of any other website in the same cookie domain.
'application/x-opc+zip',
+ 'application/msword',
+ 'application/vnd.ms-powerpoint',
+ 'application/vnd.msexcel',
);
/**
Property changes on: branches/REL1_17/phase3/includes/DefaultSettings.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/new-installer/phase3/includes/DefaultSettings.php:43664-66004
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381
/trunk/phase3/includes/DefaultSettings.php:79166,79746,79860,80109,80113,80137-80138,80205,80210,80222-80223,80231,80272,80381,80432-80433,80436,80443,80475,80554,80575,80590,80614-80616,80620,80656,80666
+ /branches/REL1_15/phase3/includes/DefaultSettings.php:51646
/branches/new-installer/phase3/includes/DefaultSettings.php:43664-66004
/branches/sqlite/includes/DefaultSettings.php:58211-58321
/branches/wmf-deployment/includes/DefaultSettings.php:53381
/trunk/phase3/includes/DefaultSettings.php:78395,79166,79746,79860,79968,80109,80113,80137-80138,80205,80210,80222-80223,80231,80272,80381,80432-80433,80436,80443,80475,80554,80575,80590,80614-80616,80620,80656,80666,81311,81313,81349,81352,81376,81389,81397,81399,81412
Modified: branches/REL1_17/phase3/includes/HTMLForm.php
===================================================================
--- branches/REL1_17/phase3/includes/HTMLForm.php 2011-02-02 20:25:47 UTC
(rev 81412)
+++ branches/REL1_17/phase3/includes/HTMLForm.php 2011-02-02 20:45:32 UTC
(rev 81413)
@@ -471,7 +471,11 @@
function getErrors( $errors ) {
if ( $errors instanceof Status ) {
global $wgOut;
- $errorstr = $wgOut->parse( $errors->getWikiText() );
+ if ( $errors->isOK() ) {
+ $errorstr = '';
+ } else {
+ $errorstr = $wgOut->parse(
$errors->getWikiText() );
+ }
} elseif ( is_array( $errors ) ) {
$errorstr = $this->formatErrors( $errors );
} else {
Property changes on: branches/REL1_17/phase3/includes/HTMLForm.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/new-installer/phase3/includes/HTMLForm.php:43664-66004
/branches/sqlite/includes/HTMLForm.php:58211-58321
/branches/wmf-deployment/includes/HTMLForm.php:53381
/trunk/phase3/includes/HTMLForm.php:78445,78448,78454
+ /branches/REL1_15/phase3/includes/HTMLForm.php:51646
/branches/new-installer/phase3/includes/HTMLForm.php:43664-66004
/branches/sqlite/includes/HTMLForm.php:58211-58321
/branches/wmf-deployment/includes/HTMLForm.php:53381
/trunk/phase3/includes/HTMLForm.php:78395,78445,78448,78454,79968,81311,81313,81349,81352,81376,81389,81397,81399,81412
Modified: branches/REL1_17/phase3/includes/ImagePage.php
===================================================================
--- branches/REL1_17/phase3/includes/ImagePage.php 2011-02-02 20:25:47 UTC
(rev 81412)
+++ branches/REL1_17/phase3/includes/ImagePage.php 2011-02-02 20:45:32 UTC
(rev 81413)
@@ -330,7 +330,7 @@
$height_orig = $this->displayImg->getHeight( $page );
$height = $height_orig;
- $longDesc = wfMsgExt( 'parentheses', 'parseinline',
$this->displayImg->getLongDesc() );
+ $longDesc = wfMsg( 'parentheses',
$this->displayImg->getLongDesc() );
wfRunHooks( 'ImageOpenShowImageInlineBefore', array(
&$this, &$wgOut ) );
Modified: branches/REL1_17/phase3/includes/Pager.php
===================================================================
--- branches/REL1_17/phase3/includes/Pager.php 2011-02-02 20:25:47 UTC (rev
81412)
+++ branches/REL1_17/phase3/includes/Pager.php 2011-02-02 20:45:32 UTC (rev
81413)
@@ -1047,20 +1047,26 @@
function getLimitForm() {
global $wgScript;
+ return Xml::openElement(
+ 'form',
+ array(
+ 'method' => 'get',
+ 'action' => $wgScript
+ ) ) . "\n" . $this->getLimitDropdown() . "</form>\n";
+ }
+
+ /**
+ * Gets a limit selection dropdown
+ *
+ * @return string
+ */
+ function getLimitDropdown() {
# Make the select with some explanatory text
$msgSubmit = wfMsgHtml( 'table_pager_limit_submit' );
- return
- Xml::openElement(
- 'form',
- array(
- 'method' => 'get',
- 'action' => $wgScript
- )
- ) . "\n" .
- wfMsgHtml( 'table_pager_limit', $this->getLimitSelect()
) .
+
+ return wfMsgHtml( 'table_pager_limit', $this->getLimitSelect()
) .
"\n<input type=\"submit\" value=\"$msgSubmit\"/>\n" .
- $this->getHiddenFields( array( 'limit' ) ) .
- "</form>\n";
+ $this->getHiddenFields( array( 'limit' ) );
}
/**
Modified: branches/REL1_17/phase3/includes/Revision.php
===================================================================
--- branches/REL1_17/phase3/includes/Revision.php 2011-02-02 20:25:47 UTC
(rev 81412)
+++ branches/REL1_17/phase3/includes/Revision.php 2011-02-02 20:45:32 UTC
(rev 81413)
@@ -82,6 +82,9 @@
if ( isset( $row->ar_text ) && !$row->ar_text_id ) {
// Pre-1.5 ar_text row
$attribs['text'] = self::getRevisionText( $row, 'ar_' );
+ if ( $attribs['text'] === false ) {
+ throw new MWException( 'Unable to load text
from archive row (possibly bug 22624)' );
+ }
}
return new self( $attribs );
}
Property changes on: branches/REL1_17/phase3/includes/Revision.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/Revision.php:51646
/branches/new-installer/phase3/includes/Revision.php:43664-66004
/branches/sqlite/includes/Revision.php:58211-58321
/branches/wmf/1.16wmf4/includes/Revision.php:80947
/branches/wmf-deployment/includes/Revision.php:53381
/trunk/phase3/includes/Revision.php:78395,79968,81311,81313,81349,81352,81376,81389,81397,81399,81412
Modified: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/MysqlUpdater.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/phase3/includes/installer/MysqlUpdater.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -173,6 +173,7 @@
array( 'addTable', 'module_deps',
'patch-module_deps.sql' ),
array( 'dropIndex', 'archive', 'ar_page_revid',
'patch-archive_kill_ar_page_revid.sql' ),
array( 'addIndex', 'archive', 'ar_revid',
'patch-archive_ar_revid.sql' ),
+ array( 'doLangLinksLengthUpdate' ),
);
}
@@ -815,4 +816,18 @@
$this->applyPatch( 'patch-categorylinks-better-collation2.sql'
);
$this->output( "done.\n" );
}
+
+ protected function doLangLinksLengthUpdate() {
+ $langlinks = $this->db->tableName( 'langlinks' );
+ $res = $this->db->query( "SHOW COLUMNS FROM $langlinks LIKE
'll_lang'" );
+ $row = $this->db->fetchObject( $res );
+
+ if ( $row && $row->Type == "varbinary(10)" ) {
+ $this->output( 'Updating length of ll_lang in
langlinks...' );
+ $this->applyPatch( 'patch-langlinks-ll_lang-20.sql' );
+ $this->output( "done.\n" );
+ } else {
+ $this->output( "...ll_lang is up-to-date.\n" );
+ }
+ }
}
Property changes on: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/MysqlUpdater.php:51646
/branches/new-installer/phase3/includes/installer/MysqlUpdater.php:43664-66004
/branches/sqlite/includes/installer/MysqlUpdater.php:58211-58321
/branches/wmf-deployment/includes/installer/MysqlUpdater.php:53381
/trunk/phase3/includes/installer/MysqlUpdater.php:78043,78078,78231,78259,78285,78300,78450,78531-78532,78823,78946,79056,79066,79166,79191,79246,79283,79358,79480-79481,79537,79678,79684,79693,79738,79741,79745-79746,79750,79767-79768,79812
+ /branches/REL1_15/phase3/includes/installer/MysqlUpdater.php:51646
/branches/new-installer/phase3/includes/installer/MysqlUpdater.php:43664-66004
/branches/sqlite/includes/installer/MysqlUpdater.php:58211-58321
/branches/wmf-deployment/includes/installer/MysqlUpdater.php:53381
/trunk/phase3/includes/installer/MysqlUpdater.php:78043,78078,78231,78259,78285,78300,78395,78450,78531-78532,78823,78946,79056,79066,79166,79191,79246,79283,79358,79480-79481,79537,79678,79684,79693,79738,79741,79745-79746,79750,79767-79768,79812,79968,81311,81313,81349,81352,81376,81389,81397,81399,81412
Modified: branches/REL1_17/phase3/includes/specials/SpecialSearch.php
===================================================================
--- branches/REL1_17/phase3/includes/specials/SpecialSearch.php 2011-02-02
20:25:47 UTC (rev 81412)
+++ branches/REL1_17/phase3/includes/specials/SpecialSearch.php 2011-02-02
20:45:32 UTC (rev 81413)
@@ -587,7 +587,7 @@
if( $img ) {
$thumb = $img->transform( array( 'width' =>
120, 'height' => 120 ) );
if( $thumb ) {
- $desc = wfMsgExt( 'parentheses',
'parseinline', $img->getShortDesc() );
+ $desc = wfMsg( 'parentheses',
$img->getShortDesc() );
wfProfileOut( __METHOD__ );
// Float doesn't seem to interact well
with the bullets.
// Table messes up vertical alignment
of the bullets.
Property changes on: branches/REL1_17/phase3/includes/specials/SpecialSearch.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialSearch.php:51646
/branches/sqlite/includes/specials/SpecialSearch.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialSearch.php:53381,56967
/trunk/phase3/includes/specials/SpecialSearch.php:78262-78320,79561,79915,79957,79964,79990,80687,80697,80755,80771,80773-80774,80779,80816,80833,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171
+ /branches/REL1_15/phase3/includes/specials/SpecialSearch.php:51646
/branches/sqlite/includes/specials/SpecialSearch.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialSearch.php:53381,56967
/trunk/phase3/includes/specials/SpecialSearch.php:78262-78320,78395,79561,79915,79957,79964,79968,79990,80687,80697,80755,80771,80773-80774,80779,80816,80833,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171,81311,81313,81349,81352,81376,81389,81397,81399,81412
Copied:
branches/REL1_17/phase3/maintenance/archives/patch-langlinks-ll_lang-20.sql
(from rev 81311,
trunk/phase3/maintenance/archives/patch-langlinks-ll_lang-20.sql)
===================================================================
--- branches/REL1_17/phase3/maintenance/archives/patch-langlinks-ll_lang-20.sql
(rev 0)
+++ branches/REL1_17/phase3/maintenance/archives/patch-langlinks-ll_lang-20.sql
2011-02-02 20:45:32 UTC (rev 81413)
@@ -0,0 +1,3 @@
+ALTER TABLE /*$wgDBprefix*/langlinks
+ MODIFY `ll_lang`
+ VARBINARY(20) NOT NULL DEFAULT '';
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
