From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Thu, 5 May 2005 21:37:54 +0000 (+0000)
Subject: * Moved <div class='patrollink'> into Article.php rather than declare it in
X-Git-Tag: 1.5.0alpha2~295
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%27%20%20%20mw.html.escape%28%20mw.util.getUrl%28%20%27link%27%20%29%20%29%20%20%20%27?a=commitdiff_plain;h=db9ac6cb4354405d07eed9707a78f45577090e55;p=lhc%2Fweb%2Fwiklou.git

* Moved <div class='patrollink'> into Article.php rather than declare it in
  every markaspatrolledlink message.
---

diff --git a/includes/Article.php b/includes/Article.php
index b1de9dcfb7..35b1ed525f 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -758,13 +758,19 @@ class Article {
 
 		# If we have been passed an &rcid= parameter, we want to give the user a
 		# chance to mark this new article as patrolled.
-		if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
-		     ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
+		if ( $wgUseRCPatrol
+			&& !is_null($rcid)
+			&& $rcid != 0
+			&& $wgUser->isLoggedIn()
+			&& ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
 		{
-			$wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
-				$sk->makeKnownLinkObj ( $this->mTitle, wfMsg ( 'markaspatrolledtext' ),
-					'action=markpatrolled&rcid='.$rcid )
-			 ) );
+			$wgOut->addHTML(
+				"<div class='patrollink'>" .
+					wfMsg ( 'markaspatrolledlink',
+					$sk->makeKnownLinkObj( $this->mTitle, wfMsg('markaspatrolledtext'), "action=markpatrolled&rcid=$rcid" )
+			 		) .
+				'</div>'
+			 );
 		}
 
 		# Put link titles into the link cache
diff --git a/languages/Language.php b/languages/Language.php
index 9ce7da9fd6..c2cf86fcfe 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1689,7 +1689,7 @@ article [[Train]].
 
 # Patrolling
 'markaspatrolleddiff'   => "Mark as patrolled",
-'markaspatrolledlink'   => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledlink'   => "[$1]",
 'markaspatrolledtext'   => "Mark this article as patrolled",
 'markedaspatrolled'     => "Marked as patrolled",
 'markedaspatrolledtext' => "The selected revision has been marked as patrolled.",
diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index 24df39eb08..ba287f407b 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -1018,7 +1018,7 @@ Por favor, elige otro nombre.",
 
 # Patrolling
 'markaspatrolleddiff'   => "Marcar como revisado",
-'markaspatrolledlink'   => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledlink'   => "[$1]",
 'markaspatrolledtext'   => "Marcar este artículo como revisado",
 'markedaspatrolled'     => "Marcar como revisado",
 'markedaspatrolledtext' => "La versión seleccionada ha sido marcada como revisada.",
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 993b00150e..54e3399be6 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -1099,7 +1099,7 @@ Jälkimmäisessä tapauksessa voit myös käyttää linkkiä. Esimerkiksi [[Juna
 // HOX
 # Patrolling
 'markaspatrolleddiff'   => 'Merkitse tarkastetuksi',
-'markaspatrolledlink'   => '<div class="patrollink">[$1]</div>',
+'markaspatrolledlink'   => '[$1]',
 'markaspatrolledtext'   => 'Merkitse sivu tarkastetuksi',
 'markedaspatrolled'     => 'Tarkastettu',
 'markedaspatrolledtext' => 'Valittu versio on tarkastettu.',
diff --git a/languages/LanguageId.php b/languages/LanguageId.php
index 3ee6a0aa78..4e4dc157c9 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -1220,7 +1220,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 
 # Patrolling
 'markaspatrolleddiff'   => "Tandai telah diperiksa",
-'markaspatrolledlink'   => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledlink'   => "[$1]",
 'markaspatrolledtext'   => "Tandai artikel ini telah diperiksa",
 'markedaspatrolled'     => "Telah ditandai telah diperiksa",
 'markedaspatrolledtext' => "Revisi yang dipilih telah ditandai sebagai telah diperiksa",
diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index 387e1a27a2..0fbce8ced1 100644
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -1450,7 +1450,7 @@ Gruppen, de nich wählt warrn, warrn nich ännert. Du kannst de Utwahl vun en Gr
 
 # Patrolleern
 'markaspatrolleddiff'       => 'As patrolleert markeern',
-'markaspatrolledlink'       => '<div class=\'patrollink\'>[$1]</div>',
+'markaspatrolledlink'       => '[$1]',
 'markaspatrolledtext'       => 'Disse Siet as patrolleert markeern',
 'markedaspatrolled'         => 'As patrolleert markeert',
 'markedaspatrolledtext'     => 'Disse Revision is as patrolleert markeert.',
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index 9fcc9a3ca5..7495c0b062 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -1211,7 +1211,7 @@ Skriv "0" som første bokstav for å slå av den nye kategoriutsjånaden.',
 
 # Patrolling
 'markaspatrolleddiff'   => 'Merk som patruljert',
-'markaspatrolledlink'   => '<div class=\'patrollink\'>[$1]</div>',
+'markaspatrolledlink'   => '[$1]',
 'markaspatrolledtext'   => 'Merk denne innhaldssida som patruljert',
 'markedaspatrolled'     => 'Merk som patruljert',
 'markedaspatrolledtext' => 'Den valde versjonen er vorten merkt som patruljert.',
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 84e02f68d1..a68fe4b8d3 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1517,7 +1517,7 @@ The wiki server can\'t provide data in a format your client can read.',
 
 # Patrolling
 'markaspatrolleddiff'   => "Пометить как проверенную",
-'markaspatrolledlink'   => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledlink'   => "[$1]",
 'markaspatrolledtext'   => "Пометить эту статью как проверенную",
 'markedaspatrolled'     => "Помечена как проверенная",
 'markedaspatrolledtext' => "Выбранная версия помечена как проверенная.",