From: Jeroen De Dauw Date: Tue, 13 Dec 2011 21:34:16 +0000 (+0000) Subject: revert r106095, fix apparently not this simple X-Git-Tag: 1.31.0-rc.0~25983 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=a62e242a303aa41eb27bf9465d495c4fccb6ebc0;p=lhc%2Fweb%2Fwiklou.git revert r106095, fix apparently not this simple --- diff --git a/includes/Article.php b/includes/Article.php index a3e5590307..80ae24097f 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1276,7 +1276,7 @@ class Article extends Page { $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'cannotdelete', wfEscapeWikiText( $title->getPrefixedText() ) ) ); - $wgOut->addHTML( Xml::element( 'h2', null, LogPage::getName( 'delete' ) ) ); + $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); LogEventsList::showLogExtract( $wgOut, 'delete', @@ -1456,7 +1456,7 @@ class Article extends Page { } $wgOut->addHTML( $form ); - $wgOut->addHTML( Xml::element( 'h2', null, LogPage::getName( 'delete' ) ) ); + $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); LogEventsList::showLogExtract( $wgOut, 'delete', $this->getTitle()->getPrefixedText() ); @@ -1489,7 +1489,7 @@ class Article extends Page { $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'cannotdelete', wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) ) ); - $wgOut->addHTML( Xml::element( 'h2', null, LogPage::getName( 'delete' ) ) ); + $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); LogEventsList::showLogExtract( $wgOut, diff --git a/includes/ChangesList.php b/includes/ChangesList.php index f2d10e12b2..32a8d47524 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -666,7 +666,7 @@ class EnhancedChangesList extends ChangesList { if( $logType ) { $logtitle = SpecialPage::getTitleFor( 'Log', $logType ); $clink = '(' . Linker::linkKnown( $logtitle, - LogPage::getName( $logType ) ) . ')'; + LogPage::logName( $logType ) ) . ')'; } else { $clink = Linker::link( $rc->getTitle() ); } @@ -676,7 +676,7 @@ class EnhancedChangesList extends ChangesList { list( $specialName, $logtype ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] ); if ( $specialName == 'Log' ) { # Log updates, etc - $logname = LogPage::getName( $logtype ); + $logname = LogPage::logName( $logtype ); $clink = '(' . Linker::linkKnown( $rc->getTitle(), $logname ) . ')'; } else { wfDebug( "Unexpected special page in recentchanges\n" ); @@ -1124,7 +1124,7 @@ class EnhancedChangesList extends ChangesList { # Article or log link if( $logType ) { $logtitle = SpecialPage::getTitleFor( 'Log', $logType ); - $logname = LogPage::getName( $logType ); + $logname = LogPage::logName( $logType ); $r .= '(' . Linker::linkKnown( $logtitle, htmlspecialchars( $logname ) ) . ')'; } else { $this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched ); diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index fcf4105294..eedb68e0c6 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -258,7 +258,7 @@ class FileDeleteForm { */ private function showLogEntries() { global $wgOut; - $wgOut->addHTML( '

' . htmlspecialchars( LogPage::getName( 'delete' ) ) . "

\n" ); + $wgOut->addHTML( '

' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); LogEventsList::showLogExtract( $wgOut, 'delete', $this->title ); } diff --git a/includes/LogPage.php b/includes/LogPage.php index 454f9356eb..a6cf3d373b 100644 --- a/includes/LogPage.php +++ b/includes/LogPage.php @@ -195,7 +195,7 @@ class LogPage { * @deprecated in 1.19, warnings in 1.21. Use getDescription() */ public static function logHeader( $type ) { - wfDeprecated( __METHOD__, '1.19' ); + # wfDeprecated( __METHOD__, '1.19' ); global $wgLogHeaders; return wfMsgExt( $wgLogHeaders[$type], array( 'parseinline' ) ); } @@ -398,7 +398,7 @@ class LogPage { # Use the language name for log titles, rather than Log/X if( $name == 'Log' ) { - $titleLink = '(' . Linker::link( $title, LogPage::getName( $par ) ) . ')'; + $titleLink = '(' . Linker::link( $title, LogPage::logName( $par ) ) . ')'; } else { $titleLink = Linker::link( $title ); } diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php index e8ca05434c..caa949dacc 100644 --- a/includes/ProtectionForm.php +++ b/includes/ProtectionForm.php @@ -609,7 +609,7 @@ class ProtectionForm { */ function showLogExtract( &$out ) { # Show relevant lines from the protection log: - $out->addHTML( Xml::element( 'h2', null, LogPage::getName( 'protect' ) ) ); + $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'protect' ) ) ); LogEventsList::showLogExtract( $out, 'protect', $this->mTitle ); # Let extensions add other relevant log extracts wfRunHooks( 'ProtectionForm::showLogExtract', array($this->mArticle,$out) ); diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php index 5c6266b7a5..19650da95b 100644 --- a/includes/specials/SpecialMergeHistory.php +++ b/includes/specials/SpecialMergeHistory.php @@ -226,7 +226,7 @@ class SpecialMergeHistory extends SpecialPage { } # Show relevant lines from the deletion log: - $out->addHTML( '

' . htmlspecialchars( LogPage::getName( 'merge' ) ) . "

\n" ); + $out->addHTML( '

' . htmlspecialchars( LogPage::logName( 'merge' ) ) . "

\n" ); LogEventsList::showLogExtract( $out, 'merge', $this->mTargetObj ); # When we submit, go by page ID to avoid some nasty but unlikely collisions. diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 6a1985c904..5eb0247e3d 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -588,7 +588,7 @@ class MovePageForm extends UnlistedSpecialPage { function showLogFragment( $title ) { $out = $this->getOutput(); - $out->addHTML( Xml::element( 'h2', null, LogPage::getName( 'move' ) ) ); + $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'move' ) ) ); LogEventsList::showLogExtract( $out, 'move', $title ); } diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index d307e09b2a..dce79d3f38 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -201,12 +201,12 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { $qc = $this->getLogQueryCond(); # Show relevant lines from the deletion log - $output->addHTML( "

" . htmlspecialchars( LogPage::getName( 'delete' ) ) . "

\n" ); + $output->addHTML( "

" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); LogEventsList::showLogExtract( $output, 'delete', $this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) ); # Show relevant lines from the suppression log if( $user->isAllowed( 'suppressionlog' ) ) { - $output->addHTML( "

" . htmlspecialchars( LogPage::getName( 'suppress' ) ) . "

\n" ); + $output->addHTML( "

" . htmlspecialchars( LogPage::logName( 'suppress' ) ) . "

\n" ); LogEventsList::showLogExtract( $output, 'suppress', $this->targetObj, '', array( 'lim' => 25, 'conds' => $qc ) ); } diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php index 710ec1e3dd..100d5c116d 100644 --- a/includes/specials/SpecialUserrights.php +++ b/includes/specials/SpecialUserrights.php @@ -600,7 +600,7 @@ class UserrightsPage extends SpecialPage { * @param $output OutputPage to use */ protected function showLogFragment( $user, $output ) { - $output->addHTML( Xml::element( 'h2', null, LogPage::getName( 'rights' ) . "\n" ) ); + $output->addHTML( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) ); LogEventsList::showLogExtract( $output, 'rights', $user->getUserPage() ); } }