From d801c01f1a6e4428d2a9e5009683e1355bc7fe5a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 21 May 2007 18:45:31 +0000
Subject: [PATCH] Revert r22245 and all its monster offspring... Adding a class
 for the example is not only ugly, it's fragile -- customizations to the
 actual threshold will have no effect on the sample. The sensible thing is to
 construct an actual bit of sample text using the actual classes -- a null
 link (<a href="#">) with appropriate class would show the effect nicely and
 be robust to customizations.

---
 RELEASE-NOTES                         | 1 -
 includes/DefaultSettings.php          | 2 +-
 includes/SpecialPreferences.php       | 4 ++--
 languages/messages/MessagesDa.php     | 2 +-
 languages/messages/MessagesDe.php     | 2 +-
 languages/messages/MessagesEn.php     | 2 +-
 languages/messages/MessagesHe.php     | 2 +-
 languages/messages/MessagesId.php     | 2 +-
 languages/messages/MessagesKk_cn.php  | 2 +-
 languages/messages/MessagesKk_kz.php  | 2 +-
 languages/messages/MessagesKk_tr.php  | 2 +-
 languages/messages/MessagesZh_cn.php  | 2 +-
 languages/messages/MessagesZh_tw.php  | 2 +-
 languages/messages/MessagesZh_yue.php | 2 +-
 skins/chick/main.css                  | 5 +----
 skins/common/cologneblue.css          | 2 +-
 skins/common/nostalgia.css            | 2 +-
 skins/monobook/main.css               | 3 +--
 skins/simple/main.css                 | 5 +----
 19 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index aa4c5ac89f..a3103109e4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -32,7 +32,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 9628) Show warnings about slave lag on Special:Contributions,
   Special:Watchlist
 * (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext"
-* (bug 9886) Give a sample stub link in stub threshold label in preferences
   
 == Bugfixes since 1.10 ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 463e96f2d1..a4ea5903fb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1125,7 +1125,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '73';
+$wgStyleVersion = '72';
 
 
 # Server-side caching:
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index b4ae86dd7c..e9c5418f95 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -949,8 +949,8 @@ class PreferencesForm {
 		# Misc
 		#
 		$wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>');
-		$wgOut->addHtml( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
-		$wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
+		$wgOut->addHTML( wfInputLabel( wfMsg( 'stubthreshold' ),
+			'wpStubs', 'wpStubs', 6, $this->mStubs ) );
 		$msgUnderline = htmlspecialchars( wfMsg ( 'tog-underline' ) );
 		$msgUnderlinenever = htmlspecialchars( wfMsg ( 'underline-never' ) );
 		$msgUnderlinealways = htmlspecialchars( wfMsg ( 'underline-always' ) );
diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index 9c1babe42e..54303491be 100644
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -858,7 +858,7 @@ Prøv en anden forespørgsel.',
 'resultsperpage'           => 'Resultater pr. side',
 'contextlines'             => 'Linjer pr. resultat',
 'contextchars'             => 'Tegn pr. linje i resultatet',
-'stub-threshold'           => 'Grænseværdi for <span class="mw-stub-example">stub link</span> formattering:',
+'stubthreshold'            => 'Grænse for visning af artikelstumper',
 'recentchangesdays'        => 'Antal dage, som listen „Sidste ændringer“ standardmæssigt skal omfatte:',
 'recentchangescount'       => 'Antallet af titler på siden "seneste ændringer"',
 'savedprefs'               => 'Dine indstillinger er blevet gemt.',
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index e5c3fc096c..fc842cc7cd 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -885,7 +885,7 @@ Wenn Sie sich mit dem Thema auskennen, können Sie selbst die Seite „[[$1]]“
 'resultsperpage'           => 'Treffer pro Seite:',
 'contextlines'             => 'Zeilen pro Treffer:',
 'contextchars'             => 'Zeichen pro Zeile:',
-'stub-threshold'           => 'Grenzwert zur Markierung der Links auf <span class="mw-stub-example">kurze Seiten <i>(stubs)</i></span> (in Byte):',
+'stubthreshold'            => 'Kleine Seiten markieren bis (Byte):',
 'recentchangesdays'        => 'Anzahl der Tage, die die Liste der „Letzten Änderungen“ standardmäßig umfassen soll:',
 'recentchangescount'       => 'Anzahl der Einträge in „Letzte Änderungen“ und „Neue Artikel“:',
 'savedprefs'               => 'Ihre Einstellungen wurden gespeichert.',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c643424c2e..64818588c6 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1254,7 +1254,7 @@ containing all of the search terms will appear in the result).",
 'resultsperpage' => 'Hits per page:',
 'contextlines'	=> 'Lines per hit:',
 'contextchars'	=> 'Context per line:',
-'stub-threshold' => 'Threshold for <span class="mw-stub-example">stub link</span> formatting:',
+'stubthreshold' => 'Threshold for stub display:',
 'recentchangesdays' => 'Days to show in recent changes:',
 'recentchangescount' => 'Number of edits to show in recent changes:',
 'savedprefs'	=> 'Your preferences have been saved.',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index a561561b6b..bab0420742 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -918,7 +918,7 @@ $messages = array(
 'resultsperpage'           => 'מספר תוצאות בעמוד',
 'contextlines'             => 'שורות לכל תוצאה',
 'contextchars'             => 'מספר תווי קונטקסט בשורה',
-'stub-threshold'           => 'סף לעיצוב <span class="mw-stub-example">קישורים לקצרמרים</span>:',
+'stubthreshold'            => 'סף להצגת דפים קצרים (קצרמרים)',
 'recentchangesdays'        => 'מספר הימים שיוצגו בדף השינויים האחרונים:',
 'recentchangescount'       => 'מספר העריכות שיוצגו בדף השינויים האחרונים:',
 'savedprefs'               => 'העדפותיך נשמרו.',
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index e21fa0ce3b..a3dbb68ace 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -945,7 +945,7 @@ Pengurus lain akan dapat mengakses isi tersebunyi dan dapat membatalkan penghapu
 'resultsperpage'           => 'Hasil per halaman:',
 'contextlines'             => 'Baris ditampilkan per hasil:',
 'contextchars'             => 'Karakter untuk konteks per baris:',
-'stub-threshold'           => 'Ambang batas untuk <span class="mw-stub-example">pranala tulisan rintisan</span>:',
+'stubthreshold'            => 'Ambang batas tampilan rintisan:',
 'recentchangesdays'        => 'Jumlah hari yang ditampilkan di perubahan terbaru:',
 'recentchangescount'       => 'Jumlah suntingan yang ditampilkan di perubahan terbaru:',
 'savedprefs'               => 'Preferensi Anda telah disimpan',
diff --git a/languages/messages/MessagesKk_cn.php b/languages/messages/MessagesKk_cn.php
index 5b83e3e450..6a304fa8c0 100644
--- a/languages/messages/MessagesKk_cn.php
+++ b/languages/messages/MessagesKk_cn.php
@@ -1107,7 +1107,7 @@ $1',
 'resultsperpage'           => 'بەت سايىن نٵتيجە سانى:',
 'contextlines'             => 'نٵتيجە سايىن جول سانى:',
 'contextchars'             => 'جول سايىن ٵرٸپ سانى:',
-'stub-threshold'           => '<span class="mw-stub-example">بٸتەمە سٸلتەمەسٸن</span> پٸشٸمدەۋ تابالدىرىعى:',
+'stubthreshold'            => 'بٸتەمە كٶرستەتۋٸن انىقتاۋ تابالدىرىعى:',
 'recentchangesdays'        => 'جٷىقتاعى ٶزگەرٸستەردەگٸ كٶرسەتٸلەتٸن كٷندەر:',
 'recentchangescount'       => 'جۋىقتاعى ٶزگەرٸستەردەگٸ كٶرسەتٸلەتٸن تٷزەتۋلەر:',
 'savedprefs'               => 'باپتاۋلارىڭىز ساقتالدى.',
diff --git a/languages/messages/MessagesKk_kz.php b/languages/messages/MessagesKk_kz.php
index 150772a894..f01696a69c 100644
--- a/languages/messages/MessagesKk_kz.php
+++ b/languages/messages/MessagesKk_kz.php
@@ -1099,7 +1099,7 @@ $1',
 'resultsperpage'           => 'Бет сайын нәтиже саны:',
 'contextlines'             => 'Нәтиже сайын жол саны:',
 'contextchars'             => 'Жол сайын әріп саны:',
-'stub-threshold'           => '<span class="mw-stub-example">Бітеме сілтемесін</span> пішімдеу табалдырығы:',
+'stubthreshold'            => 'Бітеме көрстетуін анықтау табалдырығы:',
 'recentchangesdays'        => 'Жүықтағы өзгерістердегі көрсетілетін күндер:',
 'recentchangescount'       => 'Жуықтағы өзгерістердегі көрсетілетін түзетулер:',
 'savedprefs'               => 'Баптауларыңыз сақталды.',
diff --git a/languages/messages/MessagesKk_tr.php b/languages/messages/MessagesKk_tr.php
index d47f00af90..30c68d1001 100644
--- a/languages/messages/MessagesKk_tr.php
+++ b/languages/messages/MessagesKk_tr.php
@@ -1100,7 +1100,7 @@ barlıq şart sözder kedesse körsetiledi) bolwı mümkin.",
 'resultsperpage'           => 'Bet saýın nätïje sanı:',
 'contextlines'             => 'Nätïje saýın jol sanı:',
 'contextchars'             => 'Jol saýın ärip sanı:',
-'stub-threshold'           => '<span class="mw-stub-example">Biteme siltemesin</span> pişimdew tabaldırığı:',
+'stubthreshold'            => 'Biteme körstetwin anıqtaw tabaldırığı:',
 'recentchangesdays'        => 'Jüıqtağı özgeristerdegi körsetiletin künder:',
 'recentchangescount'       => 'Jwıqtağı özgeristerdegi körsetiletin tüzetwler:',
 'savedprefs'               => 'Baptawlarıñız saqtaldı.',
diff --git a/languages/messages/MessagesZh_cn.php b/languages/messages/MessagesZh_cn.php
index 5372cc1a94..ef63c2abb3 100644
--- a/languages/messages/MessagesZh_cn.php
+++ b/languages/messages/MessagesZh_cn.php
@@ -791,7 +791,7 @@ MySQL返回错误“$3: $4”。',
 'resultsperpage'           => '每页显示链接数',
 'contextlines'             => '每链显示行数:',
 'contextchars'             => '每行显示字数:',
-'stub-threshold'           => '<span class="mw-stub-example">小作品链接</span>格式门限值:',
+'stubthreshold'            => '小作品显示门限值',
 'recentchangesdays'        => '最近更改中的顯示日數:',
 'recentchangescount'       => '最近更改中的編輯數:',
 'savedprefs'               => '您的个人参数设置已经保存。',
diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index 108b2aa472..89aa4e9957 100644
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -765,7 +765,7 @@ MySQL返回錯誤「$3: $4」。',
 'resultsperpage'           => '每頁顯示連結數',
 'contextlines'             => '每連結行數:',
 'contextchars'             => '每行字數:',
-'stub-threshold'           => '<span class="mw-stub-example">短文章連結</span>格式基本限制:',
+'stubthreshold'            => '短文章顯示基本限制',
 'recentchangesdays'        => '最近更改中的顯示日數:',
 'recentchangescount'       => '最近更改中的編輯數:',
 'savedprefs'               => '您的個人參數設置已經保存。',
diff --git a/languages/messages/MessagesZh_yue.php b/languages/messages/MessagesZh_yue.php
index bd5ce0ba9e..4e9d0d8274 100644
--- a/languages/messages/MessagesZh_yue.php
+++ b/languages/messages/MessagesZh_yue.php
@@ -882,7 +882,7 @@ MySQL 嘅錯誤回應 "$3: $4"',
 'resultsperpage' 	=> '每頁顯示嘅擊中數：',
 'contextlines'		=> '每一擊顯示嘅行數：',
 'contextchars'		=> '每一行嘅字數：',
-'stub-threshold' 	=> '<span class="mw-stub-example">楔連結</span>格式門檻：',
+'stubthreshold' 	=> '楔位文章門檻：',
 'recentchangesdays' 	=> '最近更改中嘅顯示日數：',
 'recentchangescount' 	=> '最近更改中嘅編輯數：',
 'savedprefs'		=> '你嘅喜好設定已經儲存。',
diff --git a/skins/chick/main.css b/skins/chick/main.css
index 3b78aadfd5..997dd5111f 100644
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -16,10 +16,7 @@ body {
 a { color: #002bb8; }
 a:visited { color: #5a3696; }
 a:active { color: #ffa500; }
-a.stub,
-span.mw-stub-example {
-	color: #772233;
-}
+a.stub { color: #772233; }
 a.new,
 #p-personal a.new { color:#ba0000; }
 a.new:visited,
diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index b367dbaa4a..5b6e5bca1a 100644
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -89,7 +89,7 @@ a { color: #223366; }
 a.external { color: #336644; }
 a:visited { color: #8D0749; }
 a.printable { text-decoration: underline; }
-a.stub, span.mw-stub-example, #quickbar a.stub { color:#772233; text-decoration:none; }
+a.stub, #quickbar a.stub { color:#772233; text-decoration:none; }
 a.new, #quickbar a.new { color: #CC2200; }
 h2, h3, h4, h5, h6 { margin-bottom: 0; }
 small { font-size: 75%; }
diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css
index 9c98294d6b..c9b36a70b0 100644
--- a/skins/common/nostalgia.css
+++ b/skins/common/nostalgia.css
@@ -8,7 +8,7 @@ body {
 }
 a.interwiki, a.external { color: #3366BB; }
 a.printable { text-decoration: underline; }
-a.stub, span.mw-stub-example { color:#772233; text-decoration:none; }
+a.stub { color:#772233; text-decoration:none; }
 h1.pagetitle { padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0; }
 h2, h3, h4, h5, h6 { margin-bottom: 0; }
 textarea { overflow: auto; }
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 1c3ef37dc0..4b9dd358df 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -92,8 +92,7 @@ a:active {
 a:hover {
 	text-decoration: underline;
 }
-a.stub,
-span.mw-stub-example {
+a.stub {
 	color: #772233;
 }
 a.new, #p-personal a.new {
diff --git a/skins/simple/main.css b/skins/simple/main.css
index 7e738e3ac7..ea682ecc55 100644
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -347,10 +347,7 @@ div.tleft {
     border-width: 0.5em 1.4em 0.8em 0;
 }
 
-a.stub,
-span.mw-stub-example {
-	color: #772233;
-}
+a.stub { color: #772233; }
 a.new,
 #p-personal a.new {
 	text-decoration: line-through;
-- 
2.20.1