http://www.mediawiki.org/wiki/Special:Code/MediaWiki/67029
Revision: 67029
Author: platonides
Date: 2010-05-28 21:22:45 +0000 (Fri, 28 May 2010)
Log Message:
-----------
Bug 23699: Add trailing \n at the end of <div>s in wrapWikiMsg()
Patch by Umherirrender
Modified Paths:
--------------
trunk/phase3/includes/Article.php
trunk/phase3/includes/EditPage.php
trunk/phase3/includes/HistoryPage.php
trunk/phase3/includes/ImagePage.php
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/SpecialPage.php
trunk/phase3/includes/diff/DifferenceInterface.php
trunk/phase3/includes/specials/SpecialBooksources.php
trunk/phase3/includes/specials/SpecialConfirmemail.php
trunk/phase3/includes/specials/SpecialImport.php
trunk/phase3/includes/specials/SpecialMovepage.php
trunk/phase3/includes/specials/SpecialPreferences.php
trunk/phase3/includes/specials/SpecialRecentchangeslinked.php
trunk/phase3/includes/specials/SpecialRevisiondelete.php
trunk/phase3/includes/specials/SpecialTags.php
trunk/phase3/includes/specials/SpecialUndelete.php
trunk/phase3/includes/upload/UploadBase.php
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2010-05-28 20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/Article.php 2010-05-28 21:22:45 UTC (rev 67029)
@@ -1186,7 +1186,7 @@
if ( $this->mTitle->isTalkPage() ) {
$msg = wfMsgNoTrans( 'talkpageheader' );
if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader',
$msg ) ) {
- $wgOut->wrapWikiMsg( "<div
class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader' ) );
+ $wgOut->wrapWikiMsg( "<div
class=\"mw-talkpageheader\">\n$1\n</div>", array( 'talkpageheader' ) );
}
}
}
@@ -1259,7 +1259,7 @@
$user = User::newFromName( $rootPart, false /* allow IP
users*/ );
$ip = User::isIP( $rootPart );
if ( !$user->isLoggedIn() && !$ip ) { # User does not
exist
- $wgOut->wrapWikiMsg( "<div
class=\"mw-userpage-userdoesnotexist error\">\n\$1</div>",
+ $wgOut->wrapWikiMsg( "<div
class=\"mw-userpage-userdoesnotexist error\">\n\$1\n</div>",
array(
'userpage-userdoesnotexist-view', $rootPart ) );
} else if ( $user->isBlocked() ) { # Show log extract
if the user is currently blocked
LogEventsList::showLogExtract(
@@ -1329,7 +1329,7 @@
}
// If the user is not allowed to see it...
if ( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) {
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n",
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n",
'rev-deleted-text-permission' );
return false;
// If the user needs to confirm that they want to see it...
@@ -1339,14 +1339,14 @@
$link = $this->mTitle->getFullUrl(
"oldid={$oldid}&unhide=1" );
$msg = $this->mRevision->isDeleted(
Revision::DELETED_RESTRICTED ) ?
'rev-suppressed-text-unhide' :
'rev-deleted-text-unhide';
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n",
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n",
array( $msg, $link ) );
return false;
// We are allowed to see...
} else {
$msg = $this->mRevision->isDeleted(
Revision::DELETED_RESTRICTED ) ?
'rev-suppressed-text-view' :
'rev-deleted-text-view';
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", $msg );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", $msg );
return true;
}
}
@@ -1513,7 +1513,7 @@
$o->tb_name,
$rmvtxt );
}
- $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>$1</div>\n",
array( 'trackbackbox', $tbtext ) );
+ $wgOut->wrapWikiMsg( "<div id='mw_trackbacks'>\n$1\n</div>\n",
array( 'trackbackbox', $tbtext ) );
}
/**
@@ -2673,7 +2673,7 @@
$bigHistory = $this->isBigDeletion();
if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) {
global $wgLang, $wgDeleteRevisionsLimit;
- $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
+ $wgOut->wrapWikiMsg( "<div
class='error'>\n$1\n</div>\n",
array( 'delete-toobig', $wgLang->formatNum(
$wgDeleteRevisionsLimit ) ) );
return;
}
@@ -2704,7 +2704,7 @@
);
if ( $bigHistory ) {
global $wgDeleteRevisionsLimit;
- $wgOut->wrapWikiMsg( "<div
class='error'>\n$1</div>\n",
+ $wgOut->wrapWikiMsg( "<div
class='error'>\n$1\n</div>\n",
array( 'delete-warning-toobig',
$wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
}
}
Modified: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php 2010-05-28 20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/EditPage.php 2010-05-28 21:22:45 UTC (rev 67029)
@@ -690,7 +690,7 @@
if ( $namespace == NS_MEDIAWIKI ) {
# Show a warning if editing an interface message
- $wgOut->wrapWikiMsg( "<div
class='mw-editinginterface'>\n$1</div>", 'editinginterface' );
+ $wgOut->wrapWikiMsg( "<div
class='mw-editinginterface'>\n$1\n</div>", 'editinginterface' );
}
# Show a warning message when someone creates/edits a user
(talk) page but the user does not exist
@@ -701,7 +701,7 @@
$user = User::newFromName( $username, false /* allow IP
users*/ );
$ip = User::isIP( $username );
if ( !$user->isLoggedIn() && !$ip ) { # User does not
exist
- $wgOut->wrapWikiMsg( "<div
class=\"mw-userpage-userdoesnotexist error\">\n$1</div>",
+ $wgOut->wrapWikiMsg( "<div
class=\"mw-userpage-userdoesnotexist error\">\n$1\n</div>",
array( 'userpage-userdoesnotexist',
$username ) );
} else if ( $user->isBlocked() ) { # Show log extract
if the user is currently blocked
LogEventsList::showLogExtract(
@@ -723,9 +723,9 @@
# Try to add a custom edit intro, or use the standard one if
this is not possible.
if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) {
if ( $wgUser->isLoggedIn() ) {
- $wgOut->wrapWikiMsg( "<div
class=\"mw-newarticletext\">\n$1</div>", 'newarticletext' );
+ $wgOut->wrapWikiMsg( "<div
class=\"mw-newarticletext\">\n$1\n</div>", 'newarticletext' );
} else {
- $wgOut->wrapWikiMsg( "<div
class=\"mw-newarticletextanon\">\n$1</div>", 'newarticletextanon' );
+ $wgOut->wrapWikiMsg( "<div
class=\"mw-newarticletextanon\">\n$1\n</div>", 'newarticletextanon' );
}
}
# Give a notice if the user is editing a deleted/moved page...
@@ -1234,7 +1234,7 @@
if ( $this->wasDeletedSinceLastEdit() && 'save' !=
$this->formtype ) {
$wgOut->wrapWikiMsg(
- "<div class='error
mw-deleted-while-editing'>\n$1</div>",
+ "<div class='error
mw-deleted-while-editing'>\n$1\n</div>",
'deletedwhileediting' );
} elseif ( $this->wasDeletedSinceLastEdit() ) {
// Hide the toolbar and edit area, user can click
preview to get it back
@@ -1339,7 +1339,7 @@
protected function showHeader() {
global $wgOut, $wgUser, $wgTitle, $wgMaxArticleSize, $wgLang;
if ( $this->isConflict ) {
- $wgOut->wrapWikiMsg( "<div
class='mw-explainconflict'>\n$1</div>", 'explainconflict' );
+ $wgOut->wrapWikiMsg( "<div
class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
$this->edittime = $this->mArticle->getTimestamp();
} else {
if ( $this->section != '' &&
!$this->isSectionEditSupported() ) {
@@ -1364,15 +1364,15 @@
}
if ( $this->missingComment ) {
- $wgOut->wrapWikiMsg( "<div
id='mw-missingcommenttext'>\n$1</div>", 'missingcommenttext' );
+ $wgOut->wrapWikiMsg( "<div
id='mw-missingcommenttext'>\n$1\n</div>", 'missingcommenttext' );
}
if ( $this->missingSummary && $this->section != 'new' )
{
- $wgOut->wrapWikiMsg( "<div
id='mw-missingsummary'>\n$1</div>", 'missingsummary' );
+ $wgOut->wrapWikiMsg( "<div
id='mw-missingsummary'>\n$1\n</div>", 'missingsummary' );
}
if ( $this->missingSummary && $this->section == 'new' )
{
- $wgOut->wrapWikiMsg( "<div
id='mw-missingcommentheader'>\n$1</div>", 'missingcommentheader' );
+ $wgOut->wrapWikiMsg( "<div
id='mw-missingcommentheader'>\n$1\n</div>", 'missingcommentheader' );
}
if ( $this->hookError !== '' ) {
@@ -1387,9 +1387,9 @@
// Let sysop know that this will make private content
public if saved
if ( !$this->mArticle->mRevision->userCan(
Revision::DELETED_TEXT ) ) {
- $wgOut->wrapWikiMsg( "<div
class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );
+ $wgOut->wrapWikiMsg( "<div
class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
} else if (
$this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
- $wgOut->wrapWikiMsg( "<div
class='mw-warning plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );
+ $wgOut->wrapWikiMsg( "<div
class='mw-warning plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
}
if ( !$this->mArticle->mRevision->isCurrent() )
{
Modified: trunk/phase3/includes/HistoryPage.php
===================================================================
--- trunk/phase3/includes/HistoryPage.php 2010-05-28 20:20:00 UTC (rev
67028)
+++ trunk/phase3/includes/HistoryPage.php 2010-05-28 21:22:45 UTC (rev
67029)
@@ -374,7 +374,7 @@
$this->counter = 1;
$this->oldIdChecked = 0;
- $wgOut->wrapWikiMsg( "<div
class='mw-history-legend'>\n$1</div>", 'histlegend' );
+ $wgOut->wrapWikiMsg( "<div
class='mw-history-legend'>\n$1\n</div>", 'histlegend' );
$s = Xml::openElement( 'form', array( 'action' => $wgScript,
'id' => 'mw-history-compare' ) ) . "\n";
$s .= Xml::hidden( 'title', $this->title->getPrefixedDbKey() )
. "\n";
Modified: trunk/phase3/includes/ImagePage.php
===================================================================
--- trunk/phase3/includes/ImagePage.php 2010-05-28 20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/ImagePage.php 2010-05-28 21:22:45 UTC (rev 67029)
@@ -738,7 +738,7 @@
global $wgUploadMaintenance;
if ( $wgUploadMaintenance && $this->mTitle &&
$this->mTitle->getNamespace() == NS_FILE ) {
global $wgOut;
- $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n",
array( 'filedelete-maintenance' ) );
+ $wgOut->wrapWikiMsg( "<div
class='error'>\n$1\n</div>\n", array( 'filedelete-maintenance' ) );
return;
}
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2010-05-28 20:20:00 UTC (rev
67028)
+++ trunk/phase3/includes/OutputPage.php 2010-05-28 21:22:45 UTC (rev
67029)
@@ -1935,7 +1935,7 @@
// Wiki is read only
$this->setPageTitle( wfMsg( 'readonly' ) );
$reason = wfReadOnlyReason();
- $this->wrapWikiMsg( "<div
class='mw-readonly-error'>\n$1</div>", array( 'readonlytext', $reason ) );
+ $this->wrapWikiMsg( "<div
class='mw-readonly-error'>\n$1\n</div>", array( 'readonlytext', $reason ) );
}
// Show source, if supplied
@@ -2590,11 +2590,11 @@
*
* For example:
*
- * $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>",
'some-error' );
+ * $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>",
'some-error' );
*
* Is equivalent to:
*
- * $wgOut->addWikiText( "<div class='error'>\n" . wfMsgNoTrans(
'some-error' ) . '</div>' );
+ * $wgOut->addWikiText( "<div class='error'>\n" . wfMsgNoTrans(
'some-error' ) . "\n</div>" );
*
* The newline after opening div is needed in some wikitext. See bug
19226.
*/
Modified: trunk/phase3/includes/SpecialPage.php
===================================================================
--- trunk/phase3/includes/SpecialPage.php 2010-05-28 20:20:00 UTC (rev
67028)
+++ trunk/phase3/includes/SpecialPage.php 2010-05-28 21:22:45 UTC (rev
67029)
@@ -832,7 +832,7 @@
}
$out = wfMsgNoTrans( $msg );
if ( ! wfEmptyMsg( $msg, $out ) and $out !== '' and !
$this->including() ) {
- $wgOut->wrapWikiMsg( "<div
class='mw-specialpage-summary'>\n$1</div>", $msg );
+ $wgOut->wrapWikiMsg( "<div
class='mw-specialpage-summary'>\n$1\n</div>", $msg );
}
}
Modified: trunk/phase3/includes/diff/DifferenceInterface.php
===================================================================
--- trunk/phase3/includes/diff/DifferenceInterface.php 2010-05-28 20:20:00 UTC
(rev 67028)
+++ trunk/phase3/includes/diff/DifferenceInterface.php 2010-05-28 21:22:45 UTC
(rev 67029)
@@ -353,7 +353,7 @@
if( !$allowed ) {
$msg = $suppressed ? 'rev-suppressed-no-diff' :
'rev-deleted-no-diff';
# Give explanation for why revision is not
visible
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n",
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n",
array( $msg ) );
} else {
# Give explanation and add a link to view the
diff...
@@ -363,7 +363,7 @@
'unhide' => 1
) );
$msg = $suppressed ?
'rev-suppressed-unhide-diff' : 'rev-deleted-unhide-diff';
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", array( $msg, $link ) );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", array( $msg, $link ) );
}
# Otherwise, output a regular diff...
} else {
@@ -416,9 +416,9 @@
$wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
# Add deleted rev tag if needed
if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
} else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
}
if( !$this->mNewRev->isCurrent() ) {
Modified: trunk/phase3/includes/specials/SpecialBooksources.php
===================================================================
--- trunk/phase3/includes/specials/SpecialBooksources.php 2010-05-28
20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/specials/SpecialBooksources.php 2010-05-28
21:22:45 UTC (rev 67029)
@@ -35,7 +35,7 @@
$wgOut->addHTML( $this->makeForm() );
if( strlen( $this->isbn ) > 0 ) {
if( !self::isValidISBN( $this->isbn ) ) {
- $wgOut->wrapWikiMsg( "<div
class=\"error\">\n$1</div>", 'booksources-invalid-isbn' );
+ $wgOut->wrapWikiMsg( "<div
class=\"error\">\n$1\n</div>", 'booksources-invalid-isbn' );
}
$this->showList();
}
Modified: trunk/phase3/includes/specials/SpecialConfirmemail.php
===================================================================
--- trunk/phase3/includes/specials/SpecialConfirmemail.php 2010-05-28
20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/specials/SpecialConfirmemail.php 2010-05-28
21:22:45 UTC (rev 67029)
@@ -77,7 +77,7 @@
$wgOut->addWikiMsg( 'emailauthenticated',
$time, $d, $t );
}
if( $wgUser->isEmailConfirmationPending() ) {
- $wgOut->wrapWikiMsg( "<div class=\"error
mw-confirmemail-pending\">\n$1</div>", 'confirmemail_pending' );
+ $wgOut->wrapWikiMsg( "<div class=\"error
mw-confirmemail-pending\">\n$1\n</div>", 'confirmemail_pending' );
}
$wgOut->addWikiMsg( 'confirmemail_text' );
$form = Xml::openElement( 'form', array( 'method' =>
'post', 'action' => $this->getTitle()->getLocalUrl() ) );
Modified: trunk/phase3/includes/specials/SpecialImport.php
===================================================================
--- trunk/phase3/includes/specials/SpecialImport.php 2010-05-28 20:20:00 UTC
(rev 67028)
+++ trunk/phase3/includes/specials/SpecialImport.php 2010-05-28 21:22:45 UTC
(rev 67029)
@@ -103,7 +103,7 @@
}
if( WikiError::isError( $source ) ) {
- $wgOut->wrapWikiMsg( '<p class="error">$1</p>', array(
'importfailed', $source->getMessage() ) );
+ $wgOut->wrapWikiMsg( "<p class=\"error\">\n$1\n</p>",
array( 'importfailed', $source->getMessage() ) );
} else {
$wgOut->addWikiMsg( "importstart" );
@@ -119,10 +119,10 @@
if( WikiError::isError( $result ) ) {
# No source or XML parse error
- $wgOut->wrapWikiMsg( '<p class="error">$1</p>',
array( 'importfailed', $result->getMessage() ) );
+ $wgOut->wrapWikiMsg( "<p
class=\"error\">\n$1\n</p>", array( 'importfailed', $result->getMessage() ) );
} elseif( WikiError::isError( $resultCount ) ) {
# Zero revisions
- $wgOut->wrapWikiMsg( '<p class="error">$1</p>',
array( 'importfailed', $resultCount->getMessage() ) );
+ $wgOut->wrapWikiMsg( "<p
class=\"error\">\n$1\n</p>", array( 'importfailed', $resultCount->getMessage()
) );
} else {
# Success!
$wgOut->addWikiMsg( 'importsuccess' );
Modified: trunk/phase3/includes/specials/SpecialMovepage.php
===================================================================
--- trunk/phase3/includes/specials/SpecialMovepage.php 2010-05-28 20:20:00 UTC
(rev 67028)
+++ trunk/phase3/includes/specials/SpecialMovepage.php 2010-05-28 21:22:45 UTC
(rev 67029)
@@ -174,7 +174,7 @@
$errMsg = "<p><strong
class=\"error\">$hookErr</strong></p>\n";
$wgOut->addHTML( $errMsg );
} else {
- $wgOut->wrapWikiMsg( '<p><strong
class="error">$1</strong></p>', $err );
+ $wgOut->wrapWikiMsg( "<p><strong
class=\"error\">\n$1\n</strong></p>", $err );
}
}
Modified: trunk/phase3/includes/specials/SpecialPreferences.php
===================================================================
--- trunk/phase3/includes/specials/SpecialPreferences.php 2010-05-28
20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/specials/SpecialPreferences.php 2010-05-28
21:22:45 UTC (rev 67029)
@@ -30,13 +30,13 @@
if ( $wgRequest->getCheck( 'success' ) ) {
$wgOut->wrapWikiMsg(
- '<div
class="successbox"><strong>$1</strong></div><div id="mw-pref-clear"></div>',
+ "<div
class=\"successbox\"><strong>\n$1\n</strong></div><div
id=\"mw-pref-clear\"></div>",
'savedprefs'
);
}
if ( $wgRequest->getCheck( 'eauth' ) ) {
- $wgOut->wrapWikiMsg( "<div class='error' style='clear:
both;'>\n$1</div>",
+ $wgOut->wrapWikiMsg( "<div class='error' style='clear:
both;'>\n$1\n</div>",
'eauthentsent', $wgUser->getName() );
}
Modified: trunk/phase3/includes/specials/SpecialRecentchangeslinked.php
===================================================================
--- trunk/phase3/includes/specials/SpecialRecentchangeslinked.php
2010-05-28 20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/specials/SpecialRecentchangeslinked.php
2010-05-28 21:22:45 UTC (rev 67029)
@@ -52,7 +52,7 @@
}
$title = Title::newFromURL( $target );
if( !$title || $title->getInterwiki() != '' ){
- $wgOut->wrapWikiMsg( "<div
class=\"errorbox\">\n$1</div><br style=\"clear: both\" />", 'allpagesbadtitle'
);
+ $wgOut->wrapWikiMsg( "<div
class=\"errorbox\">\n$1\n</div><br style=\"clear: both\" />",
'allpagesbadtitle' );
return false;
}
Modified: trunk/phase3/includes/specials/SpecialRevisiondelete.php
===================================================================
--- trunk/phase3/includes/specials/SpecialRevisiondelete.php 2010-05-28
20:20:00 UTC (rev 67028)
+++ trunk/phase3/includes/specials/SpecialRevisiondelete.php 2010-05-28
21:22:45 UTC (rev 67029)
@@ -533,7 +533,7 @@
protected function success() {
global $wgOut;
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
- $wgOut->wrapWikiMsg( '<span class="success">$1</span>',
$this->typeInfo['success'] );
+ $wgOut->wrapWikiMsg( "<span class=\"success\">\n$1\n</span>",
$this->typeInfo['success'] );
$this->list->reloadFromMaster();
$this->showForm();
}
Modified: trunk/phase3/includes/specials/SpecialTags.php
===================================================================
--- trunk/phase3/includes/specials/SpecialTags.php 2010-05-28 20:20:00 UTC
(rev 67028)
+++ trunk/phase3/includes/specials/SpecialTags.php 2010-05-28 21:22:45 UTC
(rev 67029)
@@ -16,7 +16,7 @@
$sk = $wgUser->getSkin();
$wgOut->setPageTitle( wfMsg( 'tags-title' ) );
- $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1</div>",
'tags-intro' );
+ $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>",
'tags-intro' );
// Write the headers
$html = '';
Modified: trunk/phase3/includes/specials/SpecialUndelete.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUndelete.php 2010-05-28 20:20:00 UTC
(rev 67028)
+++ trunk/phase3/includes/specials/SpecialUndelete.php 2010-05-28 21:22:45 UTC
(rev 67029)
@@ -665,7 +665,7 @@
if( $this->mRestore && $this->mAction == "submit" ) {
global $wgUploadMaintenance;
if( $wgUploadMaintenance && $this->mTargetObj &&
$this->mTargetObj->getNamespace() == NS_FILE ) {
- $wgOut->wrapWikiMsg( "<div
class='error'>\n$1</div>\n", array( 'filedelete-maintenance' ) );
+ $wgOut->wrapWikiMsg( "<div
class='error'>\n$1\n</div>\n", array( 'filedelete-maintenance' ) );
return;
}
return $this->undelete();
@@ -746,10 +746,10 @@
if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
if( !$rev->userCan(Revision::DELETED_TEXT) ) {
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", 'rev-deleted-text-permission' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-permission' );
return;
} else {
- $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1</div>\n", 'rev-deleted-text-view' );
+ $wgOut->wrapWikiMsg( "<div class='mw-warning
plainlinks'>\n$1\n</div>\n", 'rev-deleted-text-view' );
$wgOut->addHTML( '<br />' );
// and we are allowed to see...
}
@@ -1001,7 +1001,7 @@
$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
}
- $wgOut->wrapWikiMsg( "<div
class='mw-undelete-pagetitle'>\n$1</div>\n", array ( 'undeletepagetitle',
$this->mTargetObj->getPrefixedText() ) );
+ $wgOut->wrapWikiMsg( "<div
class='mw-undelete-pagetitle'>\n$1\n</div>\n", array ( 'undeletepagetitle',
$this->mTargetObj->getPrefixedText() ) );
$archive = new PageArchive( $this->mTargetObj );
/*
Modified: trunk/phase3/includes/upload/UploadBase.php
===================================================================
--- trunk/phase3/includes/upload/UploadBase.php 2010-05-28 20:20:00 UTC (rev
67028)
+++ trunk/phase3/includes/upload/UploadBase.php 2010-05-28 21:22:45 UTC (rev
67029)
@@ -897,7 +897,7 @@
if ( !$wgAntivirusSetup[$wgAntivirus] ) {
wfDebug( __METHOD__ . ": unknown virus scanner:
$wgAntivirus\n" );
- $wgOut->wrapWikiMsg( "<div class=\"error\">\n$1</div>",
+ $wgOut->wrapWikiMsg( "<div
class=\"error\">\n$1\n</div>",
array( 'virus-badscanner', $wgAntivirus ) );
return wfMsg( 'virus-unknownscanner' ) . "
$wgAntivirus";
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
