Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix double escaping issues. Related to r51559 and friends.

Browse source
This commit is contained in:
Siebrand Mazeland 2009-06-15 12:32:59 +00:00
parent 08811f3174
commit 6f9d6cbcf9
16 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/EditPage.php
View file

@ -1875,7 +1875,7 @@ END
$loginTitle,
wfMsgHtml( 'loginreqlink' ),
array(),
array( 'returnto' => $wgTitle->getPrefixedUrl() ),
array( 'returnto' => $wgTitle->getPrefixedText() ),
array( 'known', 'noclasses' )
);

2
includes/ImagePage.php
View file

@ -921,7 +921,7 @@ class ImageHistoryList {
$wgLang->timeAndDate( $timestamp, true ),
array(),
array(
'target' => $wgTitle->getPrefixedUrl(),
'target' => $wgTitle->getPrefixedText(),
'file' => $img,
'token' => $wgUser->editToken( $img )
),

4
includes/LogEventsList.php
View file

@ -367,7 +367,7 @@ class LogEventsList {
$this->message['revdel-restore'],
array(),
array(
'target' => $title->getPrefixedUrl(),
'target' => $title->getPrefixedText(),
'type' => $key,
'ids' => $query
),
@ -389,7 +389,7 @@ class LogEventsList {
$this->message['revdel-restore'],
array(),
array(
'target' => $title->getPrefixedUrl(),
'target' => $title->getPrefixedText(),
'type' => 'logging',
'ids' => $query
),

2
includes/OutputPage.php
View file

@ -1258,7 +1258,7 @@ class OutputPage {
$loginTitle,
wfMsgHtml( 'loginreqlink' ),
array(),
array( 'returnto' => $this->getTitle()->getPrefixedUrl() ),
array( 'returnto' => $this->getTitle()->getPrefixedText() ),
array( 'known', 'noclasses' )
);
$this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );

2
includes/PageHistory.php
View file

@ -94,7 +94,7 @@ class PageHistory {
$logPage,
wfMsgHtml( 'viewpagelogs' ),
array(),
array( 'page' => $this->mTitle->getPrefixedUrl() ),
array( 'page' => $this->mTitle->getPrefixedText() ),
array( 'known', 'noclasses' )
);
$wgOut->setSubtitle( $logLink );

9
includes/SkinTemplate.php
View file

@ -938,8 +938,13 @@ class SkinTemplate extends Skin {
if( $id ) {
$logPage = SpecialPage::getTitleFor( 'Log' );
$nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
. $this->mTitle->getPartialUrl() ) );
$nav_urls['log'] = array(
'href' => $logPage->getLocalUrl(
array(
'user' => $this->mTitle->getText()
)
)
);
} else {
$nav_urls['log'] = false;
}

4
includes/specials/SpecialAllpages.php
View file

@ -384,7 +384,7 @@ class SpecialAllpages extends IncludableSpecialPage {
# Do we put a previous link ?
if( isset( $prevTitle ) && $pt = $prevTitle->getText() ) {
$query = array( 'from' => $prevTitle->getPartialUrl() );
$query = array( 'from' => $prevTitle->getText() );
if( $namespace )
$query['namespace'] = $namespace;
@ -401,7 +401,7 @@ class SpecialAllpages extends IncludableSpecialPage {
if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
# $s is the first link of the next chunk
$t = Title::MakeTitle($namespace, $s->page_title);
$query = array( 'from' => $t->getPartialUrl() );
$query = array( 'from' => $t->getText() );
if( $namespace )
$query['namespace'] = $namespace;

2
includes/specials/SpecialConfirmemail.php
View file

@ -39,7 +39,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
$title,
wfMsgHtml( 'loginreqlink' ),
array(),
array( 'returnto' => $this->getTitle()->getPrefixedUrl() )
array( 'returnto' => $this->getTitle()->getPrefixedText() )
);
$wgOut->addHTML( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
}

4
includes/specials/SpecialContributions.php
View file

@ -168,7 +168,7 @@ class SpecialContributions extends SpecialPage {
array(),
array(
'type' => 'block',
'page' => $nt->getPrefixedUrl()
'page' => $nt->getPrefixedText()
)
);
}
@ -177,7 +177,7 @@ class SpecialContributions extends SpecialPage {
SpecialPage::getTitleFor( 'Log' ),
wfMsg( 'sp-contributions-logs' ),
array(),
array( 'user' => $nt->getPartialUrl() )
array( 'user' => $nt->getText() )
);
# Add link to deleted user contributions for priviledged users

12
includes/specials/SpecialDeletedContributions.php
View file

@ -132,7 +132,7 @@ class DeletedContribsPager extends IndexPager {
array(),
array(
'type' => 'delete',
'page' => $page->getPrefixedUrl()
'page' => $page->getPrefixedText()
)
);
@ -146,7 +146,7 @@ class DeletedContribsPager extends IndexPager {
htmlspecialchars( $page->getPrefixedText() ),
array(),
array(
'target' => $page->getPrefixedUrl(),
'target' => $page->getPrefixedText(),
'timestamp' => $rev->getTimestamp()
)
);
@ -156,7 +156,7 @@ class DeletedContribsPager extends IndexPager {
$this->messages['diff'],
array(),
array(
'target' => $page->getPrefixedUrl(),
'target' => $page->getPrefixedText(),
'timestamp' => $rev->getTimestamp(),
'diff' => 'prev'
)
@ -173,7 +173,7 @@ class DeletedContribsPager extends IndexPager {
$d,
array(),
array(
'target' => $page->getPrefixedUrl(),
'target' => $page->getPrefixedText(),
'timestamp' => $rev->getTimestamp()
)
);
@ -347,7 +347,7 @@ class DeletedContributionsPage extends SpecialPage {
array(),
array(
'type' => 'block',
'page' => $nt->getPrefixedUrl()
'page' => $nt->getPrefixedText()
)
);
}
@ -356,7 +356,7 @@ class DeletedContributionsPage extends SpecialPage {
SpecialPage::getTitleFor( 'Log' ),
wfMsgHtml( 'sp-contributions-logs' ),
array(),
array( 'user' => $nt->getPartialUrl() )
array( 'user' => $nt->getText() )
);
# Link to undeleted contributions
$tools[] = $sk->linkKnown(

2
includes/specials/SpecialProtectedpages.php
View file

@ -109,7 +109,7 @@ class ProtectedPagesForm {
array(),
array(
'type' => 'protect',
'page' => $title->getPrefixedUrl()
'page' => $title->getPrefixedText()
)
) . ')';
}

10
includes/specials/SpecialRevisiondelete.php
View file

@ -190,7 +190,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
$logtitle,
wfMsgHtml( 'viewpagelogs' ),
array(),
array( 'page' => $this->targetObj->getPrefixedUrl() )
array( 'page' => $this->targetObj->getPrefixedText() )
);
# Give a link to the page history
$links[] = $this->skin->linkKnown(
@ -1582,8 +1582,12 @@ class RevDel_LogItem extends RevDel_Item {
$title = Title::makeTitle( $this->row->log_namespace, $this->row->log_title );
$logtitle = SpecialPage::getTitleFor( 'Log' );
$loglink = $this->special->skin->link( $logtitle, wfMsgHtml( 'log' ), array(),
array( 'page' => $title->getPrefixedUrl() ) );
$loglink = $this->special->skin->link(
$logtitle,
wfMsgHtml( 'log' ),
array(),
array( 'page' => $title->getPrefixedText() )
);
// Action text
if( !$this->canView() ) {
$action = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';

2
includes/specials/SpecialUnusedtemplates.php
View file

@ -43,7 +43,7 @@ class UnusedtemplatesPage extends QueryPage {
SpecialPage::getTitleFor( 'Whatlinkshere' ),
wfMsgHtml( 'unusedtemplateswlh' ),
array(),
array( 'target' => $title->getPrefixedUrl() )
array( 'target' => $title->getPrefixedText() )
);
return wfSpecialList( $pageLink, $wlhLink );
}

2
includes/specials/SpecialUpload.php
View file

@ -727,7 +727,7 @@ class UploadForm {
array(),
array(
'type' => 'delete',
'page' => $file->getTitle()->getPrefixedUrl()
'page' => $file->getTitle()->getPrefixedText()
)
);
$warning .= '<li>' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '</li>';

2
includes/specials/SpecialWatchlist.php
View file

@ -25,7 +25,7 @@ function wfSpecialWatchlist( $par ) {
SpecialPage::getTitleFor( 'Userlogin' ),
wfMsgHtml( 'loginreqlink' ),
array(),
array( 'returnto' => $specialTitle->getPrefixedUrl() )
array( 'returnto' => $specialTitle->getPrefixedText() )
);
$wgOut->addHTML( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
return;

2
includes/specials/SpecialWhatlinkshere.php
View file

@ -310,7 +310,7 @@ class SpecialWhatLinksHere extends SpecialPage {
$title,
$text,
array(),
array( 'target' => $targetText )
array( 'target' => $target->getPrefixedText() )
);
}