X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=ac86e8f7995bccaf352916a60571bbd371614f3d;hb=e4cfd3da01053c576fe5bcb0f62eefa65033357e;hp=96e315fab232953c72bce7a572e52c2034ef7a4c;hpb=f0f675be341d9797c214632167f54935fdc77d1b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/page/Article.php b/includes/page/Article.php index 96e315fab2..ac86e8f799 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -1218,7 +1218,8 @@ class Article implements Page { if ( !( $user && $user->isLoggedIn() ) && !$ip ) { # User does not exist $outputPage->wrapWikiMsg( "
\n\$1\n
", array( 'userpage-userdoesnotexist-view', wfEscapeWikiText( $rootPart ) ) ); - } elseif ( !is_null( $block ) && $block->getType() != Block::TYPE_AUTO ) { # Show log extract if the user is currently blocked + } elseif ( !is_null( $block ) && $block->getType() != Block::TYPE_AUTO ) { + # Show log extract if the user is currently blocked LogEventsList::showLogExtract( $outputPage, 'block', @@ -1381,9 +1382,14 @@ class Article implements Page { : 'revision-info'; $outputPage = $this->getContext()->getOutput(); - $outputPage->addSubtitle( "
" . wfMessage( $infomsg, - $td )->rawParams( $userlinks )->params( $revision->getID(), $tddate, - $tdtime, $revision->getUserText() )->rawParams( Linker::revComment( $revision, true, true ) )->parse() . "
" ); + $outputPage->addSubtitle( "
" . + wfMessage( $infomsg, $td ) + ->rawParams( $userlinks ) + ->params( $revision->getID(), $tddate, $tdtime, $revision->getUserText() ) + ->rawParams( Linker::revComment( $revision, true, true ) ) + ->parse() . + "
" + ); $lnk = $current ? wfMessage( 'currentrevisionlink' )->escaped() @@ -1631,10 +1637,11 @@ class Article implements Page { if ( $hasHistory ) { $title = $this->getTitle(); - // The following can use the real revision count as this is only being shown for users that can delete - // this page. - // This, as a side-effect, also makes sure that the following query isn't being run for pages with a - // larger history, unless the user has the 'bigdelete' right (and is about to delete this page). + // The following can use the real revision count as this is only being shown for users + // that can delete this page. + // This, as a side-effect, also makes sure that the following query isn't being run for + // pages with a larger history, unless the user has the 'bigdelete' right + // (and is about to delete this page). $dbr = wfGetDB( DB_SLAVE ); $revisions = $edits = (int)$dbr->selectField( 'revision', @@ -1644,7 +1651,8 @@ class Article implements Page { ); // @todo FIXME: i18n issue/patchwork message - $this->getContext()->getOutput()->addHTML( '' . + $this->getContext()->getOutput()->addHTML( + '' . wfMessage( 'historywarning' )->numParams( $revisions )->parse() . wfMessage( 'word-separator' )->plain() . Linker::linkKnown( $title, wfMessage( 'history' )->escaped(), @@ -1799,6 +1807,9 @@ class Article implements Page { $loglink = '[[Special:Log/delete|' . wfMessage( 'deletionlog' )->text() . ']]'; $outputPage->addWikiMsg( 'deletedtext', wfEscapeWikiText( $deleted ), $loglink ); + + wfRunHooks( 'ArticleDeleteAfterSuccess', array( $this->getTitle(), $outputPage ) ); + $outputPage->returnToMain( false ); } else { $outputPage->setPageTitle(