r51460 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r51459‎ | r51460 | r51461 >
Date:09:48, 4 June 2009
Author:werdna
Status:ok (Comments)
Tags:
Comment:
Revert r51128, and its follow-up revisions r51129, r51130, r51390.
Commit message was: "* (bug 18958) Added ability to disable entire variant conversion engine per user preferences (languages with language converter class only)"
Reverted because of multiple issues on CodeReview, notably:
* Unexplained rename of a configuration variable, with no backwards-compatibility code.
* Suspected parser cache pollution.
* Variant tabs flip-flop with parser cache misses and hits.
* Hacky implementation: changing configuration variables on the fly is almost always a bad idea, unless you are writing a configuration extension.
* Implementation of default is done as a special case in code accessing the preference, rather than by adding an entry to $wgDefaultUserOptions.
Modified paths:
  • /trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/analyzer/extractor/TemplateNamePatternParameterExtractor.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/AbstractPageProcessor.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/ImportProgressTracker.java (modified) (history)
  • /trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/WikiWordPageProcessor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/AssemblingFeatureSetCursor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/Association.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/AssociationCursor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/CollapsingAssociationCursor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/CollapsingMatchesCursor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/DefaultFeatureSet.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FeatureSet.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FeatureSets.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/MappingCandidates.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/ResultSetFeatureSetFactory.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/ConceptMappingPassThrough.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/ConceptMappingProcessor.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/OptimalMappingSelector.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/store/MappingFeatureStoreBuilder.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/AssemblingFeatureSetCursorTest.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/AssociationTest.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/CollapsingAssociationCursorTest.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/CollapsingMatchesCursorTest.java (modified) (history)
  • /trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/FeatureSetsTest.java (modified) (history)
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/Preferences.php (modified) (history)
  • /trunk/phase3/includes/Skin.php (modified) (history)
  • /trunk/phase3/includes/SkinTemplate.php (modified) (history)
  • /trunk/phase3/languages/LanguageConverter.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesGan_hans.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesGan_hant.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesJa.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesKk.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesKk_arab.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesKk_cyrl.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesKk_latn.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesLzh.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesQqq.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesSr.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesSr_ec.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesSr_el.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesYue.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesZh.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesZh_hans.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesZh_hant.php (modified) (history)
  • /trunk/phase3/maintenance/language/messageTypes.inc (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)
  • /trunk/phase3/skins/Vector.php (modified) (history)
  • /trunk/testing/installer/installfiles/toolkit (modified) (history)
  • /trunk/testing/installer/installfiles/toolkit/check_isolation.install (modified) (history)
  • /trunk/testing/installer/installfiles/toolkit/exttest.install (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
——@@ -53,7 +53,7 @@
5454 'tog-watchlisthideliu',
5555 'tog-watchlisthideanons',
5656 'tog-watchlisthidepatrolled',
57 - 'tog-variantconversion',
 57+ 'tog-nolangconversion',
5858 'tog-ccmeonemails',
5959 'tog-diffonly',
6060 'tog-showhiddencats',
Index: trunk/phase3/maintenance/language/messageTypes.inc
——@@ -165,7 +165,7 @@
166166 'sectionlink',
167167 'unit-pixel',
168168 'userrights-irreversible-marker',
169 - 'tog-variantconversion',
 169+ 'tog-nolangconversion',
170170 'tog-noconvertlink',
171171 'yourvariant',
172172 'variantname-zh-hans',
Index: trunk/phase3/skins/Vector.php
——@@ -48,7 +48,7 @@
4949 */
5050 function buildNavigationUrls() {
5151 global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
52 - global $wgEnableVariants;
 52+ global $wgDisableLangConversion;
5353
5454 wfProfileIn( __METHOD__ );
5555
——@@ -291,7 +291,7 @@
292292 // Gets list of language variants
293293 $variants = $wgContLang->getVariants();
294294 // Checks that language conversion is enabled and variants exist
295 - if( $wgEnableVariants && count( $variants ) > 1 ) {
 295+ if( !$wgDisableLangConversion && count( $variants ) > 1 ) {
296296 // Gets preferred variant
297297 $preferred = $wgContLang->getPreferredVariant();
298298 // Loops over each variant
Index: trunk/phase3/includes/SkinTemplate.php
——@@ -819,9 +819,9 @@
820820 }
821821
822822 /* show links to different language variants */
823 - global $wgEnableVariants;
 823+ global $wgDisableLangConversion;
824824 $variants = $wgContLang->getVariants();
825 - if( $wgEnableVariants && sizeof( $variants ) > 1 ) {
 825+ if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
826826 $preferred = $wgContLang->getPreferredVariant();
827827 $vcount=0;
828828 foreach( $variants as $code ) {
——@@ -1107,4 +1107,4 @@
11081108 $msg = $this->translator->translate( $str );
11091109 return ( $msg != '-' ) && ( $msg != '' ); # ????
11101110 }
1111 -}
 1111+}
\ No newline at end of file
Index: trunk/phase3/includes/DefaultSettings.php
——@@ -887,7 +887,7 @@
888888 $wgCheckSerialized = true;
889889
890890 /** Whether to enable language variant conversion. */
891 -$wgEnableVariants = true;
 891+$wgDisableLangConversion = false;
892892
893893 /** Whether to enable language variant conversion for links. */
894894 $wgDisableTitleConversion = false;
Index: trunk/phase3/includes/Preferences.php
——@@ -215,10 +215,10 @@
216216 'label-message' => 'yourlanguage',
217217 );
218218
219 - global $wgContLang, $wgEnableVariants;
 219+ global $wgContLang, $wgDisableLangConversion;
220220 /* see if there are multiple language variants to choose from*/
221221 $variantArray = array();
222 - if($wgEnableVariants) {
 222+ if(!$wgDisableLangConversion) {
223223 $variants = $wgContLang->getVariants();
224224
225225 $languages = Language::getLanguageNames( true );
——@@ -247,7 +247,7 @@
248248 }
249249 }
250250
251 - if( count($variantArray) > 1 && $wgEnableVariants && !$wgDisableTitleConversion ) {
 251+ if( count($variantArray) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion ) {
252252 $defaultPreferences['noconvertlink'] =
253253 array(
254254 'type' => 'toggle',
Index: trunk/phase3/includes/Skin.php
——@@ -1272,9 +1272,9 @@
12731273 function variantLinks() {
12741274 $s = '';
12751275 /* show links to different language variants */
1276 - global $wgEnableVariants, $wgLang, $wgContLang;
 1276+ global $wgDisableLangConversion, $wgLang, $wgContLang;
12771277 $variants = $wgContLang->getVariants();
1278 - if( $wgEnableVariants && sizeof( $variants ) > 1 ) {
 1278+ if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
12791279 foreach( $variants as $code ) {
12801280 $varname = $wgContLang->getVariantname( $code );
12811281 if( $varname == 'disable' )
Index: trunk/phase3/languages/LanguageConverter.php
——@@ -425,14 +425,7 @@
426426 * @public
427427 */
428428 function parserConvert( $text, &$parser ) {
429 - global $wgUser, $wgEnableVariants;
430 -
431 - /* disable entire conversion engine if the user had been disabled it */
432 - $variantConv = $wgUser->getOption( 'variantconversion' );
433 - if ( ( $wgEnableVariants == true ) && ( $variantConv === 0 ) ) {
434 - $wgEnableVariants = false;
435 - }
436 -
 429+ global $wgDisableLangConversion;
437430 /* don't do anything if this is the conversion table */
438431 if ( $parser->getTitle()->getNamespace() == NS_MEDIAWIKI &&
439432 strpos($parser->mTitle->getText(), "Conversiontable") !== false )
——@@ -440,7 +433,7 @@
441434 return $text;
442435 }
443436
444 - if ( !$wgEnableVariants )
 437+ if ( $wgDisableLangConversion )
445438 return $text;
446439
447440 $text = $this->convert( $text );
——@@ -579,11 +572,11 @@
580573 * @public
581574 */
582575 function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
583 - global $wgEnableVariants, $wgDisableTitleConversion, $wgRequest, $wgUser;
 576+ global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest, $wgUser;
584577 $isredir = $wgRequest->getText( 'redirect', 'yes' );
585578 $action = $wgRequest->getText( 'action' );
586579 $linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
587 - $disableLinkConversion = !$wgEnableVariants || $wgDisableTitleConversion;
 580+ $disableLinkConversion = $wgDisableLangConversion || $wgDisableTitleConversion;
588581 $linkBatch = new LinkBatch();
589582
590583 $ns=NS_MAIN;
Index: trunk/phase3/languages/messages/MessagesQqq.php
——@@ -127,7 +127,7 @@
128128 'tog-watchlisthideliu' => "Option in tab 'Watchlist' of [[Special:Preferences]]",
129129 'tog-watchlisthideanons' => "Option in tab 'Watchlist' of [[Special:Preferences]]",
130130 'tog-watchlisthidepatrolled' => 'Option in Watchlist tab of [[Special:Preferences]]',
131 -'tog-variantconversion' => 'In user preferences.',
 131+'tog-nolangconversion' => 'In user preferences.',
132132 'tog-ccmeonemails' => 'In user preferences',
133133 'tog-diffonly' => 'Toggle option used in [[Special:Preferences]].',
134134 'tog-showhiddencats' => 'Toggle option used in [[Special:Preferences]].',
Index: trunk/phase3/languages/messages/MessagesSr_el.php
——@@ -52,6 +52,11 @@
5353 'Разговор_о_категорији' => NS_CATEGORY_TALK,
5454 );
5555
 56+
 57+$extraUserToggles = array(
 58+ 'nolangconversion',
 59+);
 60+
5661 $datePreferenceMigrationMap = array(
5762 'default',
5863 'hh:mm d. month y.',
Index: trunk/phase3/languages/messages/MessagesZh_hans.php
——@@ -161,6 +161,9 @@
162162 'Tags' => array( '标签' ),
163163 );
164164
 165+$extraUserToggles = array(
 166+ 'nolangconversion',
 167+);
165168 $datePreferences = array(
166169 'default',
167170 'ISO 8601',
——@@ -226,7 +229,7 @@
227230 'tog-watchlisthideliu' => '在监视列表中隐藏登录用户',
228231 'tog-watchlisthideanons' => '在监视列表中隐藏匿名用户',
229232 'tog-watchlisthidepatrolled' => '在监视列表中隐藏已巡查的编辑',
230 -'tog-variantconversion' => '进行字词转换',
 233+'tog-nolangconversion' => '不进行字词转换',
231234 'tog-ccmeonemails' => '把我发送给其他用户的邮件同时发送副本给我自己',
232235 'tog-diffonly' => '在比较两个修订版本差异时不显示页面内容',
233236 'tog-showhiddencats' => '显示隐藏分类',
Index: trunk/phase3/languages/messages/MessagesYue.php
——@@ -180,7 +180,7 @@
181181 'tog-watchlisthideliu' => '響監視清單度隱藏登入用戶',
182182 'tog-watchlisthideanons' => '響監視清單度隱藏匿名用戶',
183183 'tog-watchlisthidepatrolled' => '響監視清單度隱藏巡查過嘅編輯',
184 -'tog-variantconversion' => '要用字轉換',
 184+'tog-nolangconversion' => '唔要用字轉換',
185185 'tog-ccmeonemails' => '當我寄電郵畀其他人嗰陣寄返封副本畀我',
186186 'tog-diffonly' => '響差異下面唔顯示頁面內容',
187187 'tog-showhiddencats' => '顯示隱藏類',
Index: trunk/phase3/languages/messages/MessagesGan_hans.php
——@@ -64,7 +64,7 @@
6565 'tog-watchlisthideown' => '监视列表弆到偶𠮶编辑',
6666 'tog-watchlisthidebots' => '监视列表弆到机器人𠮶编辑',
6767 'tog-watchlisthideminor' => '监视列表弆到细修改',
68 -'tog-variantconversion' => '要字转换',
 68+'tog-nolangconversion' => '嫑字转换',
6969 'tog-ccmeonemails' => '偶发email到人家时也发封副本到偶',
7070 'tog-diffonly' => '比较两只版本差异𠮶时间伓显示文章𠮶内容',
7171 'tog-showhiddencats' => '显示弆到𠮶分类',
Index: trunk/phase3/languages/messages/MessagesKk_arab.php
——@@ -51,6 +51,10 @@
5252 'underline' => 0,
5353 );
5454
 55+$extraUserToggles = array(
 56+ 'nolangconversion'
 57+);
 58+
5559 $fallback8bitEncoding = 'windows-1256';
5660
5761 $namespaceNames = array(
Index: trunk/phase3/languages/messages/MessagesZh_hant.php
——@@ -204,7 +204,7 @@
205205 'tog-watchlisthideliu' => '監視列表中隱藏登入用戶',
206206 'tog-watchlisthideanons' => '監視列表中隱藏匿名用戶',
207207 'tog-watchlisthidepatrolled' => '監視清單中隱藏已巡查的編輯',
208 -'tog-variantconversion' => '進行用字轉換',
 208+'tog-nolangconversion' => '不進行用字轉換',
209209 'tog-ccmeonemails' => '當我寄電子郵件給其他用戶時，也寄一份複本到我的信箱。',
210210 'tog-diffonly' => '在比較兩個修訂版本差異時不顯示頁面內容',
211211 'tog-showhiddencats' => '顯示隱藏分類',
Index: trunk/phase3/languages/messages/MessagesEn.php
——@@ -538,7 +538,7 @@
539539 'tog-watchlisthideliu' => 'Hide edits by logged in users from the watchlist',
540540 'tog-watchlisthideanons' => 'Hide edits by anonymous users from the watchlist',
541541 'tog-watchlisthidepatrolled' => 'Hide patrolled edits from the watchlist',
542 -'tog-variantconversion' => 'Enable variants conversion', # only translate this message to other languages if you have to change it
 542+'tog-nolangconversion' => 'Disable variants conversion', # only translate this message to other languages if you have to change it
543543 'tog-ccmeonemails' => 'Send me copies of e-mails I send to other users',
544544 'tog-diffonly' => 'Do not show page content below diffs',
545545 'tog-showhiddencats' => 'Show hidden categories',
Index: trunk/phase3/languages/messages/MessagesZh.php
——@@ -170,10 +170,6 @@
171171 'DeletedContributions' => array( '已删除的用户贡献', '已刪除的用戶貢獻' ),
172172 );
173173
174 -$extraUserToggles = array(
175 - 'variantconversion',
176 -);
177 -
178174 $messages = array(
179175 # User preference toggles
180176 'tog-norollbackdiff' => '進行回退後略過差異比較',
Index: trunk/phase3/languages/messages/MessagesKk.php
——@@ -13,10 +13,6 @@
1414
1515 $fallback = 'kk-cyrl';
1616
17 -$extraUserToggles = array(
18 - 'variantconversion'
19 -);
20 -
2117 $messages = array(
2218 # Edit pages
2319 'edittools' => '<!-- Мындағы мәтін өңдеу және қотару пішіндердің астында көрсетіледі. -->',
Index: trunk/phase3/languages/messages/MessagesGan_hant.php
——@@ -89,7 +89,7 @@
9090 'tog-watchlisthideown' => '監視列表弆到偶嗰編輯',
9191 'tog-watchlisthidebots' => '監視列表弆到機器人嗰編輯',
9292 'tog-watchlisthideminor' => '監視列表弆到細修改',
93 -'tog-variantconversion' => '要字轉換',
 93+'tog-nolangconversion' => '嫑字轉換',
9494 'tog-ccmeonemails' => '偶發email到人家時也發封副本到偶',
9595 'tog-diffonly' => '比較兩隻版本差異嗰時間伓顯示文章嗰內容',
9696 'tog-showhiddencats' => '顯示弆到嗰分類',
Index: trunk/phase3/languages/messages/MessagesJa.php
——@@ -318,7 +318,7 @@
319319 'tog-watchlisthideliu' => 'ウォッチリストにログイン利用者の編集を表示しない',
320320 'tog-watchlisthideanons' => 'ウォッチリストに匿名利用者の編集を表示しない',
321321 'tog-watchlisthidepatrolled' => 'ウォッチリストにパトロール済みの編集を表示しない',
322 -'tog-variantconversion' => '言語変種変換を有効にする',
 322+'tog-nolangconversion' => '言語変種変換を無効にする',
323323 'tog-ccmeonemails' => '他の利用者に送信したメールの控えを自分にも送る',
324324 'tog-diffonly' => '差分表示の下に記事本文を表示しない',
325325 'tog-showhiddencats' => '隠しカテゴリを表示する',
Index: trunk/phase3/languages/messages/MessagesLzh.php
——@@ -106,7 +106,7 @@
107107 'tog-watchlisthideliu' => '不哨有簿',
108108 'tog-watchlisthideanons' => '不哨無簿',
109109 'tog-watchlisthidepatrolled' => '不哨已巡',
110 -'tog-variantconversion' => '轉',
 110+'tog-nolangconversion' => '非轉',
111111 'tog-ccmeonemails' => '凡所遺書，請存副本。',
112112 'tog-diffonly' => '異下無示頁',
113113 'tog-showhiddencats' => '示隱類',
Index: trunk/phase3/languages/messages/MessagesSr_ec.php
——@@ -58,6 +58,11 @@
5959 'Razgovor_o_kategoriji' => NS_CATEGORY_TALK,
6060 );
6161
 62+
 63+$extraUserToggles = array(
 64+ 'nolangconversion',
 65+);
 66+
6267 $datePreferenceMigrationMap = array(
6368 'default',
6469 'hh:mm d. month y.',
Index: trunk/phase3/languages/messages/MessagesKk_cyrl.php
——@@ -27,6 +27,10 @@
2828 '.' => ',',
2929 );
3030
 31+$extraUserToggles = array(
 32+ 'nolangconversion'
 33+);
 34+
3135 $fallback8bitEncoding = 'windows-1251';
3236
3337 $namespaceNames = array(
Index: trunk/phase3/languages/messages/MessagesKk_latn.php
——@@ -31,6 +31,10 @@
3232 '.' => ',',
3333 );
3434
 35+$extraUserToggles = array(
 36+ 'nolangconversion'
 37+);
 38+
3539 $fallback8bitEncoding = 'windows-1254';
3640
3741 $namespaceNames = array(
Index: trunk/phase3/languages/messages/MessagesSr.php
——@@ -14,10 +14,6 @@
1515 $fallback = 'sr-ec';
1616 $linkTrail = '/^([abvgdđežzijklljmnnjoprstćufhcčdžšабвгдђежзијклљмнњопрстћуфхцчџш]+)(.*)$/usD';
1717
18 -$extraUserToggles = array(
19 - 'variantconversion',
20 -);
21 -
2218 $messages = array(
2319 # Special:LinkSearch
2420 'linksearch' => 'Претрага интернет веза',
Index: trunk/phase3/RELEASE-NOTES
——@@ -32,9 +32,6 @@
3333 * (bug 9257) $wgRCMaxAge now defaults to three months
3434 * $wgDevelopmentWarnings can be set to true to show warnings about deprecated
3535 functions and other potential errors when developing.
36 -* (bug 18958) $wgEnableVariants is a new boolean value to turn on or off the
37 - entire variant conversion engine, and the default is set to true. Former
38 - variable $wgDisableLangConversion was superseded by this variable.
3936 * Subpages are now enabled in the MediaWiki namespace by default. This is
4037 mainly a cosmetic change, and does not in any way affect the MessageCache,
4138 which was already effectively treating the namespace as if it had subpages.
——@@ -77,8 +74,6 @@
7875 * (bug 18860) Blocks of IPs affecting registered users can now block email
7976 * (bug 17093) Date and time are separate parameters in Special:BlockList
8077 * (bug 11484) Added ISO speed rating to default collapsed EXIF metadata view
81 -* (bug 18958) Added ability to disable entire variant conversion engine
82 - per user preferences
8378 * (bug 19012) Introduce {{NUMBEROFCONTRIBS}} variable to display the number
8479 of contributions a user has.
8580 * (bug 14866) Messages 'recentchangeslinked-toolbox' and
Property changes on: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/AbstractPageProcessor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/ImportProgressTracker.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/processor/WikiWordPageProcessor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/analyzer/extractor/TemplateNamePatternParameterExtractor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/CollapsingAssociationCursorTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/AssemblingFeatureSetCursorTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/FeatureSetsTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/AssociationTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/test/java/de/brightbyte/wikiword/integrator/data/CollapsingMatchesCursorTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/ConceptMappingPassThrough.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/OptimalMappingSelector.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor/ConceptMappingProcessor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/processor
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FeatureSet.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/ResultSetFeatureSetFactory.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/AssemblingFeatureSetCursor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/AssociationCursor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/MappingCandidates.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/Association.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/DefaultFeatureSet.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/CollapsingAssociationCursor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/FeatureSets.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/data/CollapsingMatchesCursor.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/store/MappingFeatureStoreBuilder.java
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/testing/installer/installfiles/toolkit/check_isolation.install
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/testing/installer/installfiles/toolkit/exttest.install
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: trunk/testing/installer/installfiles/toolkit
___________________________________________________________________
Deleted: svn:mergeinfo

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r51128* (bug 18958) Added ability to disable entire variant conversion engine per u...shinjiman18:13, 28 May 2009
r51129follow up r51128, reverting special page aliases which was accidentally commi...shinjiman18:22, 28 May 2009
r51130follow up r51128, update more of RELEASE-NOTESshinjiman18:31, 28 May 2009
r51390follow up r51128, adding type check for $wgUser->getOption( 'variantconversio...shinjiman08:16, 3 June 2009

Comments

#Comment by Werdna (talk | contribs)   09:50, 4 June 2009

Supposedly modifies a whole bunch of WikiWord and installer stuff, but I don't see anything in the diff.

#Comment by IAlex (talk | contribs)   10:49, 4 June 2009

You deleted the "svn:mergeinfo" property from those files.

Status & tagging log