X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FArticle.php;h=c54c6928eaabc67c0b6dd02981233a405a1991a3;hb=604c316e359b409144fb98608de94cf82a35f892;hp=40a7d515bbe674c26a4fe3167d0fa884cf24fa56;hpb=9fc8b2228e63397e3849607de96d9fa15a1ff38c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 40a7d515bb..c54c6928ea 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -703,7 +703,9 @@ class Article implements Page {
 					$this->mParserOutput = $poolArticleView->getParserOutput();
 					$outputPage->addParserOutput( $this->mParserOutput );
 					if ( $content->getRedirectTarget() ) {
-						$outputPage->addSubtitle( wfMessage( 'redirectpagesub' )->parse() );
+						$outputPage->addSubtitle(
+							"<span id=\"redirectsub\">" . wfMessage( 'redirectpagesub' )->parse() . "</span>"
+						);
 					}
 
 					# Don't cache a dirty ParserOutput object
@@ -1268,7 +1270,7 @@ class Article implements Page {
 	 * If the revision requested for view is deleted, check permissions.
 	 * Send either an error message or a warning header to the output.
 	 *
-	 * @return bool true if the view is allowed, false if not.
+	 * @return bool True if the view is allowed, false if not.
 	 */
 	public function showDeletedRevisionHeader() {
 		if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) {
@@ -1549,9 +1551,9 @@ class Article implements Page {
 		$user = $this->getContext()->getUser();
 
 		# Check permissions
-		$permission_errors = $title->getUserPermissionsErrors( 'delete', $user );
-		if ( count( $permission_errors ) ) {
-			throw new PermissionsError( 'delete', $permission_errors );
+		$permissionErrors = $title->getUserPermissionsErrors( 'delete', $user );
+		if ( count( $permissionErrors ) ) {
+			throw new PermissionsError( 'delete', $permissionErrors );
 		}
 
 		# Read-only check...
@@ -1655,11 +1657,12 @@ class Article implements Page {
 	public function confirmDelete( $reason ) {
 		wfDebug( "Article::confirmDelete\n" );
 
+		$title = $this->getTitle();
 		$outputPage = $this->getContext()->getOutput();
-		$outputPage->setPageTitle( wfMessage( 'delete-confirm', $this->getTitle()->getPrefixedText() ) );
-		$outputPage->addBacklinkSubtitle( $this->getTitle() );
+		$outputPage->setPageTitle( wfMessage( 'delete-confirm', $title->getPrefixedText() ) );
+		$outputPage->addBacklinkSubtitle( $title );
 		$outputPage->setRobotPolicy( 'noindex,nofollow' );
-		$backlinkCache = $this->getTitle()->getBacklinkCache();
+		$backlinkCache = $title->getBacklinkCache();
 		if ( $backlinkCache->hasLinks( 'pagelinks' ) || $backlinkCache->hasLinks( 'templatelinks' ) ) {
 			$outputPage->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
 				'deleting-backlinks-warning' );
@@ -1681,10 +1684,10 @@ class Article implements Page {
 		} else {
 			$suppress = '';
 		}
-		$checkWatch = $user->getBoolOption( 'watchdeletion' ) || $user->isWatched( $this->getTitle() );
+		$checkWatch = $user->getBoolOption( 'watchdeletion' ) || $user->isWatched( $title );
 
 		$form = Xml::openElement( 'form', array( 'method' => 'post',
-			'action' => $this->getTitle()->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
+			'action' => $title->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ) ) .
 			Xml::openElement( 'fieldset', array( 'id' => 'mw-delete-table' ) ) .
 			Xml::tags( 'legend', null, wfMessage( 'delete-legend' )->escaped() ) .
 			Xml::openElement( 'table', array( 'id' => 'mw-deleteconfirm-table' ) ) .
@@ -1743,14 +1746,14 @@ class Article implements Page {
 			Xml::closeElement( 'fieldset' ) .
 			Html::hidden(
 				'wpEditToken',
-				$user->getEditToken( array( 'delete', $this->getTitle()->getPrefixedText() ) )
+				$user->getEditToken( array( 'delete', $title->getPrefixedText() ) )
 			) .
 			Xml::closeElement( 'form' );
 
 			if ( $user->isAllowed( 'editinterface' ) ) {
-				$title = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' );
+				$dropdownTitle = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' );
 				$link = Linker::link(
-					$title,
+					$dropdownTitle,
 					wfMessage( 'delete-edit-reasonlist' )->escaped(),
 					array(),
 					array( 'action' => 'edit' )
@@ -1762,9 +1765,7 @@ class Article implements Page {
 
 		$deleteLogPage = new LogPage( 'delete' );
 		$outputPage->addHTML( Xml::element( 'h2', null, $deleteLogPage->getName()->text() ) );
-		LogEventsList::showLogExtract( $outputPage, 'delete',
-			$this->getTitle()
-		);
+		LogEventsList::showLogExtract( $outputPage, 'delete', $title );
 	}
 
 	/**
@@ -1818,7 +1819,7 @@ class Article implements Page {
 	 * output to the client that is necessary for this request.
 	 * (that is, it has sent a cached version of the page)
 	 *
-	 * @return bool true if cached version send, false otherwise
+	 * @return bool True if cached version send, false otherwise
 	 */
 	protected function tryFileCache() {
 		static $called = false;
@@ -1894,7 +1895,7 @@ class Article implements Page {
 	 * Override the ParserOptions used to render the primary article wikitext.
 	 *
 	 * @param ParserOptions $options
-	 * @throws MWException if the parser options where already initialized.
+	 * @throws MWException If the parser options where already initialized.
 	 */
 	public function setParserOptions( ParserOptions $options ) {
 		if ( $this->mParserOptions ) {