Index: trunk/phase3/includes/GlobalFunctions.php |
— | — | @@ -3567,16 +3567,6 @@ |
3568 | 3568 | } |
3569 | 3569 | |
3570 | 3570 | /** |
3571 | | - * Load an extension messages file |
3572 | | - * |
3573 | | - * @deprecated since 1.16, warnings in 1.18, remove in 1.20 |
3574 | | - * @codeCoverageIgnore |
3575 | | - */ |
3576 | | -function wfLoadExtensionMessages() { |
3577 | | - wfDeprecated( __FUNCTION__, '1.16' ); |
3578 | | -} |
3579 | | - |
3580 | | -/** |
3581 | 3571 | * Get a platform-independent path to the null file, e.g. /dev/null |
3582 | 3572 | * |
3583 | 3573 | * @return string |
Index: trunk/phase3/includes/PageQueryPage.php |
— | — | @@ -6,7 +6,6 @@ |
7 | 7 | * @ingroup SpecialPage |
8 | 8 | */ |
9 | 9 | abstract class PageQueryPage extends QueryPage { |
10 | | - |
11 | 10 | /** |
12 | 11 | * Format the result as a simple link to the page |
13 | 12 | * |
— | — | @@ -16,11 +15,14 @@ |
17 | 16 | */ |
18 | 17 | public function formatResult( $skin, $row ) { |
19 | 18 | global $wgContLang; |
| 19 | + |
20 | 20 | $title = Title::makeTitleSafe( $row->namespace, $row->title ); |
21 | 21 | $text = $row->title; |
| 22 | + |
22 | 23 | if ( $title instanceof Title ) { |
23 | 24 | $text = $wgContLang->convert( $title->getPrefixedText() ); |
24 | 25 | } |
| 26 | + |
25 | 27 | return Linker::linkKnown( $title, htmlspecialchars( $text ) ); |
26 | 28 | } |
27 | 29 | } |
Index: trunk/phase3/RELEASE-NOTES-1.20 |
— | — | @@ -15,6 +15,7 @@ |
16 | 16 | === New features in 1.20 === |
17 | 17 | * Added TitleIsKnown hook which gets called when determining if a page exists. |
18 | 18 | * (bug 32341) Add upload by URL domain limitation. |
| 19 | +* wfLoadExtensionMessages() was removed. Deprecated in 1.16, removed in 1.20. |
19 | 20 | |
20 | 21 | === Bug fixes in 1.20 === |
21 | 22 | * (bug 30245) Use the correct way to construct a log page title. |
Index: trunk/extensions/MassEditRegex/MassEditRegex.class.php |
— | — | @@ -60,8 +60,6 @@ |
61 | 61 | return; |
62 | 62 | } |
63 | 63 | |
64 | | - wfLoadExtensionMessages('MassEditRegex'); |
65 | | - |
66 | 64 | $this->outputHeader(); |
67 | 65 | |
68 | 66 | $strPageList = $wgRequest->getText( 'wpPageList', 'Sandbox' ); |
Index: trunk/extensions/Maps/Maps.hooks.php |
— | — | @@ -2,20 +2,20 @@ |
3 | 3 | |
4 | 4 | /** |
5 | 5 | * Static class for hooks handled by the Maps extension. |
6 | | - * |
| 6 | + * |
7 | 7 | * @since 0.7 |
8 | | - * |
| 8 | + * |
9 | 9 | * @file Maps.hooks.php |
10 | 10 | * @ingroup Maps |
11 | | - * |
| 11 | + * |
12 | 12 | * @licence GNU GPL v3 |
13 | 13 | * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
14 | 14 | */ |
15 | 15 | final class MapsHooks { |
16 | | - |
| 16 | + |
17 | 17 | /** |
18 | 18 | * Adds a link to Admin Links page. |
19 | | - * |
| 19 | + * |
20 | 20 | * @since 0.7 |
21 | 21 | * |
22 | 22 | * @param ALTree $admin_links_tree |
— | — | @@ -23,36 +23,36 @@ |
24 | 24 | * @return true |
25 | 25 | */ |
26 | 26 | public static function addToAdminLinks( ALTree &$admin_links_tree ) { |
27 | | - $displaying_data_section = $admin_links_tree->getSection( wfMsg( 'smw_adminlinks_displayingdata' ) ); |
28 | | - |
29 | | - // Escape if SMW hasn't added links. |
30 | | - if ( is_null( $displaying_data_section ) ) return true; |
31 | | - $smw_docu_row = $displaying_data_section->getRow( 'smw' ); |
32 | | - |
33 | | - $maps_docu_label = wfMsg( 'adminlinks_documentation', 'Maps' ); |
34 | | - $smw_docu_row->addItem( AlItem::newFromExternalLink( 'http://mapping.referata.com/wiki/Maps', $maps_docu_label ) ); |
35 | | - |
36 | | - return true; |
| 27 | + $displaying_data_section = $admin_links_tree->getSection( wfMsg( 'smw_adminlinks_displayingdata' ) ); |
| 28 | + |
| 29 | + // Escape if SMW hasn't added links. |
| 30 | + if ( is_null( $displaying_data_section ) ) return true; |
| 31 | + $smw_docu_row = $displaying_data_section->getRow( 'smw' ); |
| 32 | + |
| 33 | + $maps_docu_label = wfMsg( 'adminlinks_documentation', 'Maps' ); |
| 34 | + $smw_docu_row->addItem( AlItem::newFromExternalLink( 'http://mapping.referata.com/wiki/Maps', $maps_docu_label ) ); |
| 35 | + |
| 36 | + return true; |
37 | 37 | } |
38 | | - |
| 38 | + |
39 | 39 | /** |
40 | 40 | * Hook to add PHPUnit test cases. |
41 | | - * |
| 41 | + * |
42 | 42 | * @since 0.7 |
43 | | - * |
| 43 | + * |
44 | 44 | * @param array $files |
45 | 45 | * |
46 | 46 | * @return true |
47 | 47 | */ |
48 | 48 | public static function registerUnitTests( array &$files ) { |
49 | 49 | $testDir = dirname( __FILE__ ) . '/test/'; |
50 | | - |
| 50 | + |
51 | 51 | $files[] = $testDir . 'MapsCoordinateParserTest.php'; |
52 | 52 | $files[] = $testDir . 'MapsDistanceParserTest.php'; |
53 | | - |
| 53 | + |
54 | 54 | return true; |
55 | 55 | } |
56 | | - |
| 56 | + |
57 | 57 | /** |
58 | 58 | * Intercept pages in the Layer namespace to handle them correctly. |
59 | 59 | * |
— | — | @@ -65,10 +65,10 @@ |
66 | 66 | if ( $title->getNamespace() == Maps_NS_LAYER ) { |
67 | 67 | $article = new MapsLayerPage( $title ); |
68 | 68 | } |
69 | | - |
| 69 | + |
70 | 70 | return true; |
71 | 71 | } |
72 | | - |
| 72 | + |
73 | 73 | /** |
74 | 74 | * Adds global JavaScript variables. |
75 | 75 | * |
— | — | @@ -80,14 +80,14 @@ |
81 | 81 | */ |
82 | 82 | public static function onMakeGlobalVariablesScript( array &$vars ) { |
83 | 83 | global $egMapsGlobalJSVars; |
84 | | - |
| 84 | + |
85 | 85 | $vars['egMapsDebugJS'] = $GLOBALS['egMapsDebugJS']; |
86 | | - |
| 86 | + |
87 | 87 | $vars += $egMapsGlobalJSVars; |
88 | | - |
| 88 | + |
89 | 89 | return true; |
90 | 90 | } |
91 | | - |
| 91 | + |
92 | 92 | /** |
93 | 93 | * @since 0.7 |
94 | 94 | * |
— | — | @@ -100,4 +100,4 @@ |
101 | 101 | $list[Maps_NS_LAYER_TALK] = 'Layer_talk'; |
102 | 102 | return true; |
103 | 103 | } |
104 | | -} |
| 104 | +} |
Index: trunk/extensions/SemanticForms/includes/forminputs/SF_CheckboxInput.php |
— | — | @@ -43,12 +43,7 @@ |
44 | 44 | // Default to false - no need to check if it matches |
45 | 45 | // a 'false' word. |
46 | 46 | $vlc = strtolower( trim( $cur_value ) ); |
47 | | - // Manually load SMW's message values, if they weren't |
48 | | - // loaded before. |
49 | | - global $wgVersion; |
50 | | - if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
51 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
52 | | - } |
| 47 | + |
53 | 48 | if ( in_array( $vlc, explode( ',', wfMsgForContent( 'smw_true_words' ) ), true ) ) { |
54 | 49 | $checked_str = ' checked="checked"'; |
55 | 50 | } else { |
Index: trunk/extensions/SemanticProjectManagement/includes/SPM_WBS.php |
— | — | @@ -60,12 +60,9 @@ |
61 | 61 | } |
62 | 62 | |
63 | 63 | public function getName() { |
64 | | - wfLoadExtensionMessages('SemanticProjectManagement'); |
65 | 64 | return wfMsg('spm_printername_wbs'); |
66 | 65 | } |
67 | 66 | |
68 | | - |
69 | | - |
70 | 67 | /** |
71 | 68 | * This method renders the result set provided by SMW according to the printer |
72 | 69 | * |
— | — | @@ -181,7 +178,6 @@ |
182 | 179 | if ($this->getSearchLabel($outputmode)) { |
183 | 180 | $label = $this->getSearchLabel($outputmode); |
184 | 181 | } else { |
185 | | - wfLoadExtensionMessages('SemanticProjectManagement'); |
186 | 182 | $label = wfMsgForContent('spm_wbs_link'); |
187 | 183 | } |
188 | 184 | $link = $res->getQueryLink($label); |
Index: trunk/extensions/SemanticProjectManagement/includes/SPM_SpecialPage.php |
— | — | @@ -34,7 +34,6 @@ |
35 | 35 | */ |
36 | 36 | function __construct() { |
37 | 37 | parent::__construct( 'SemanticProjectManagement' ); |
38 | | - wfLoadExtensionMessages( 'SemanticProjectManagement' ); |
39 | 38 | } |
40 | 39 | //main class |
41 | 40 | function execute( $par ){ |
Index: trunk/extensions/SemanticProjectManagement/SemanticProjectManagement.php |
— | — | @@ -107,7 +107,6 @@ |
108 | 108 | if ( is_null( $displaying_data_section ) ) |
109 | 109 | return true; |
110 | 110 | $smw_docu_row = $displaying_data_section->getRow( 'smw' ); |
111 | | - wfLoadExtensionMessages( 'SemanticProjectManagement' ); |
112 | 111 | $srf_docu_label = wfMsg( 'adminlinks_documentation', wfMsg( 'spm-name' ) ); |
113 | 112 | $smw_docu_row->addItem( AlItem::newFromExternalLink( "http://www.mediawiki.org/wiki/Extension:Semantic_Project_Management", $spm_docu_label ) ); |
114 | 113 | return true; |
Index: trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.smw15.php |
— | — | @@ -478,7 +478,7 @@ |
479 | 479 | */ |
480 | 480 | protected function getSubqueryDescription( &$setNS, &$label ) { |
481 | 481 | global $smwgQPrintoutLimit; |
482 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 482 | + |
483 | 483 | $conjunction = NULL; // used for the current inner conjunction |
484 | 484 | $disjuncts = array(); // (disjunctive) array of subquery conjunctions |
485 | 485 | $printrequests = array(); // the printrequests found for this query level |
— | — | @@ -696,7 +696,7 @@ |
697 | 697 | // modified by ning ,add $relatedArticles |
698 | 698 | protected function getPropertyDescription( $propertyname, &$setNS, &$label, &$relatedArticles ) { |
699 | 699 | global $smwgSMWBetaCompatible; // support for old * printouts of beta |
700 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 700 | + |
701 | 701 | $this->readChunk(); // consume separator ":=" or "::" |
702 | 702 | // first process property chain syntax (e.g. "property1.property2::value"): |
703 | 703 | if ( $propertyname { 0 } == ' ' ) { // escape |
— | — | @@ -916,7 +916,6 @@ |
917 | 917 | */ |
918 | 918 | // modified by ning ,add $relatedArticles |
919 | 919 | protected function getArticleDescription( $firstchunk, &$setNS, &$label, &$relatedArticles ) { |
920 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
921 | 920 | $chunk = $firstchunk; |
922 | 921 | $result = NULL; |
923 | 922 | $continue = true; |
— | — | @@ -960,7 +959,6 @@ |
961 | 960 | } |
962 | 961 | |
963 | 962 | protected function finishLinkDescription( $chunk, $hasNamespaces, $result, &$setNS, &$label ) { |
964 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
965 | 963 | if ( $result === NULL ) { // no useful information or concrete error found |
966 | 964 | $this->m_errors[] = wfMsgForContent( 'smw_badqueryatom' ); |
967 | 965 | } elseif ( !$hasNamespaces && $setNS && ( $this->m_defaultns !== NULL ) ) { |
— | — | @@ -1072,7 +1070,6 @@ |
1073 | 1071 | * also be changed (if it was non-NULL). |
1074 | 1072 | */ |
1075 | 1073 | protected function addDescription( $curdesc, $newdesc, $conjunction = true ) { |
1076 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
1077 | 1074 | $notallowedmessage = 'smw_noqueryfeature'; |
1078 | 1075 | if ( $newdesc instanceof SMWSomeProperty ) { |
1079 | 1076 | $allowed = $this->m_queryfeatures & SMW_PROPERTY_QUERY; |
Index: trunk/extensions/SemanticNotifyMe/includes/SMW_NotifyProcessor.php |
— | — | @@ -478,7 +478,7 @@ |
479 | 479 | */ |
480 | 480 | protected function getSubqueryDescription( &$setNS, &$label ) { |
481 | 481 | global $smwgQPrintoutLimit; |
482 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 482 | + |
483 | 483 | $conjunction = NULL; // used for the current inner conjunction |
484 | 484 | $disjuncts = array(); // (disjunctive) array of subquery conjunctions |
485 | 485 | $printrequests = array(); // the printrequests found for this query level |
— | — | @@ -696,7 +696,7 @@ |
697 | 697 | // modified by ning ,add $relatedArticles |
698 | 698 | protected function getPropertyDescription( $propertyname, &$setNS, &$label, &$relatedArticles ) { |
699 | 699 | global $smwgSMWBetaCompatible; // support for old * printouts of beta |
700 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 700 | + |
701 | 701 | $this->readChunk(); // consume separator ":=" or "::" |
702 | 702 | // first process property chain syntax (e.g. "property1.property2::value"): |
703 | 703 | if ( $propertyname { 0 } == ' ' ) { // escape |
— | — | @@ -916,7 +916,7 @@ |
917 | 917 | */ |
918 | 918 | // modified by ning ,add $relatedArticles |
919 | 919 | protected function getArticleDescription( $firstchunk, &$setNS, &$label, &$relatedArticles ) { |
920 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 920 | + |
921 | 921 | $chunk = $firstchunk; |
922 | 922 | $result = NULL; |
923 | 923 | $continue = true; |
— | — | @@ -960,7 +960,6 @@ |
961 | 961 | } |
962 | 962 | |
963 | 963 | protected function finishLinkDescription( $chunk, $hasNamespaces, $result, &$setNS, &$label ) { |
964 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
965 | 964 | if ( $result === NULL ) { // no useful information or concrete error found |
966 | 965 | $this->m_errors[] = wfMsgForContent( 'smw_badqueryatom' ); |
967 | 966 | } elseif ( !$hasNamespaces && $setNS && ( $this->m_defaultns !== NULL ) ) { |
— | — | @@ -1072,7 +1071,6 @@ |
1073 | 1072 | * also be changed (if it was non-NULL). |
1074 | 1073 | */ |
1075 | 1074 | protected function addDescription( $curdesc, $newdesc, $conjunction = true ) { |
1076 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
1077 | 1075 | $notallowedmessage = 'smw_noqueryfeature'; |
1078 | 1076 | if ( $newdesc instanceof SMWSomeProperty ) { |
1079 | 1077 | $allowed = $this->m_queryfeatures & SMW_PROPERTY_QUERY; |
Index: trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.php |
— | — | @@ -282,7 +282,6 @@ |
283 | 283 | $qid = $this->compileQueries( $desc ); |
284 | 284 | $query = $this->m_queries[$qid]; |
285 | 285 | } else { |
286 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
287 | 286 | $this->m_errors[] = wfMsg( 'smw_concept_cache_miss', $description->getConcept()->getText() ); |
288 | 287 | } |
289 | 288 | } // else: no cache, no description (this may happen); treat like empty concept |
Index: trunk/extensions/SemanticNotifyMe/includes/storage/SMW_SQLStore2_QueriesNM.smw15.php |
— | — | @@ -389,11 +389,9 @@ |
390 | 390 | if ( $qid != -1 ) { |
391 | 391 | $query = $this->m_queries[$qid]; |
392 | 392 | } else { // somehow the concept query is no longer valid; maybe some syntax changed (upgrade) or global settings were modified since storing it |
393 | | - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); |
394 | 393 | $this->m_errors[] = wfMsg( 'smw_emptysubquery' ); // not quite the right message, but this case is very rare; let us not make detailed messages for this |
395 | 394 | } |
396 | 395 | } else { |
397 | | - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); |
398 | 396 | $this->m_errors[] = wfMsg( 'smw_concept_cache_miss', $description->getConcept()->getText() ); |
399 | 397 | } |
400 | 398 | } // else: no cache, no description (this may happen); treat like empty concept |
Index: trunk/extensions/UploadLocal/UploadLocal_body.php |
— | — | @@ -3,12 +3,10 @@ |
4 | 4 | class UploadLocal extends SpecialPage { |
5 | 5 | function __construct() { |
6 | 6 | parent::__construct( 'UploadLocal', 'uploadlocal' ); |
7 | | - wfLoadExtensionMessages( 'UploadLocal' ); |
8 | 7 | } |
9 | 8 | |
10 | 9 | function execute( $par ) { |
11 | | - global $wgRequest, $wgUploadLocalDirectory, $wgMessageCache; |
12 | | - wfLoadExtensionMessages( 'UploadLocal' ); |
| 10 | + global $wgRequest, $wgUploadLocalDirectory; |
13 | 11 | |
14 | 12 | $prefix = 'extensions/UploadLocal/'; |
15 | 13 | require($prefix . 'UploadLocalDirectory.php'); |
Index: trunk/extensions/UploadLocal/UploadLocal.i18n.php |
— | — | @@ -46,5 +46,6 @@ |
47 | 47 | 'uploadlocal_error_unknown' => 'An unknown error occurred.', |
48 | 48 | |
49 | 49 | 'right-uploadlocal' => 'Upload files from the local machine' |
| 50 | + 'action-uploadlocal' => 'upload files from the local machine' |
50 | 51 | ); |
51 | 52 | |
Index: trunk/extensions/CreditTab/CreditTab.php |
— | — | @@ -15,7 +15,7 @@ |
16 | 16 | 'path' => __FILE__, |
17 | 17 | 'name' => 'CreditTab', |
18 | 18 | 'author' => '[http://www.dasch-tour.de DaSch]', |
19 | | - 'version' => '1.2.2', |
| 19 | + 'version' => '1.3.0', |
20 | 20 | 'descriptionmsg' => 'credits-desc', |
21 | 21 | 'url' => 'https://www.mediawiki.org/wiki/Extension:CreditTab', |
22 | 22 | ); |
— | — | @@ -54,7 +54,7 @@ |
55 | 55 | } else { |
56 | 56 | $title = $obj->mTitle; |
57 | 57 | } |
58 | | - wfLoadExtensionMessages('CreditTab'); |
| 58 | + |
59 | 59 | $ctNamespace = $title->getNamespace(); |
60 | 60 | $ctInsert=false; |
61 | 61 | if ( count( $wgCreditTabNamespaces ) > 0 ) { |
Index: trunk/extensions/SemanticDrilldown/includes/SD_Utils.php |
— | — | @@ -340,9 +340,6 @@ |
341 | 341 | } |
342 | 342 | |
343 | 343 | static function booleanToString( $bool_value ) { |
344 | | - if ( function_exists( 'wfLoadExtensionMessages' ) ) { |
345 | | - wfLoadExtensionMessages( 'SemanticMediaWiki' ); |
346 | | - } |
347 | 344 | $words_field_name = ( $bool_value == true ) ? 'smw_true_words' : 'smw_false_words'; |
348 | 345 | $words_array = explode( ',', wfMsgForContent( $words_field_name ) ); |
349 | 346 | // go with the value in the array that tends to be "yes" or |
Index: trunk/extensions/MediaWikiAuth/MediaWikiAuth.php |
— | — | @@ -134,7 +134,6 @@ |
135 | 135 | $results = unserialize( $this->snoopy->results ); |
136 | 136 | wfDebugLog( 'MediaWikiAuth', 'Login result:' . print_r( $results, true ) ); |
137 | 137 | |
138 | | - wfLoadExtensionMessages( 'MediaWikiAuth' ); |
139 | 138 | $errormsg = wfMsg( 'mwa-error-unknown' ); |
140 | 139 | if ( isset( $results['login'] ) ) { |
141 | 140 | $login = $results['login']; |
Index: trunk/extensions/SemanticFormsInputs/SemanticFormsInputs.php |
— | — | @@ -96,10 +96,5 @@ |
97 | 97 | $sfgFormPrinter->registerInputType( 'SFIMenuSelect' ); |
98 | 98 | $sfgFormPrinter->registerInputType( 'SFIRegExp' ); |
99 | 99 | |
100 | | - // This function has been deprecated in 1.16, but needed for earlier versions. |
101 | | - if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
102 | | - wfLoadExtensionMessages( 'SemanticFormsInputs' ); |
103 | | - } |
104 | | - |
105 | 100 | return true; |
106 | 101 | } |
Index: trunk/extensions/Favorites/SpecialFavoritelist.php |
— | — | @@ -13,7 +13,6 @@ |
14 | 14 | class SpecialFavoritelist extends SpecialPage { |
15 | 15 | function __construct() { |
16 | 16 | parent::__construct( 'Favoritelist' ); |
17 | | - wfLoadExtensionMessages('Favoritelist'); |
18 | 17 | } |
19 | 18 | |
20 | 19 | function execute( $par ) { |
Index: trunk/extensions/EmbedVideo/EmbedVideo.hooks.php |
— | — | @@ -57,8 +57,6 @@ |
58 | 58 | # Initialize things once |
59 | 59 | if (!EmbedVideo::$initialized) { |
60 | 60 | EmbedVideo::VerifyWidthMinAndMax(); |
61 | | - # Add system messages |
62 | | - wfLoadExtensionMessages('embedvideo'); |
63 | 61 | $parser->disableCache(); |
64 | 62 | EmbedVideo::$initialized = true; |
65 | 63 | } |
Index: trunk/extensions/SemanticWebBrowser/specials/SearchTriple/SWB_SpecialBrowseWiki.php |
— | — | @@ -52,7 +52,7 @@ |
53 | 53 | public function __construct() { |
54 | 54 | global $smwgBrowseShowAll; |
55 | 55 | parent::__construct( 'BrowseWiki', '', true, false, 'default', true ); |
56 | | - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); |
| 56 | + |
57 | 57 | if ( $smwgBrowseShowAll ) { |
58 | 58 | SWBSpecialBrowseWiki::$incomingvaluescount = 21; |
59 | 59 | SWBSpecialBrowseWiki::$incomingpropertiescount = - 1; |
Index: trunk/extensions/SemanticWebBrowser/includes/datavalues/SWBResolvableUriValue.php |
— | — | @@ -28,7 +28,6 @@ |
29 | 29 | protected function parseUserValue( $value ) { |
30 | 30 | // echo "parseUserValue"; |
31 | 31 | |
32 | | - smwfLoadExtensionMessages( 'SemanticMediaWiki' ); |
33 | 32 | $value = trim( $value ); |
34 | 33 | $this->m_wikitext = $value; |
35 | 34 | if ( $this->m_caption === false ) { |
Index: trunk/extensions/ReplaceText/ReplaceText.php |
— | — | @@ -48,11 +48,14 @@ |
49 | 49 | // This function should really go into a "ReplaceText_body.php" file. |
50 | 50 | function rtAddToAdminLinks( &$admin_links_tree ) { |
51 | 51 | $general_section = $admin_links_tree->getSection( wfMsg( 'adminlinks_general' ) ); |
52 | | - $extensions_row = $general_section->getRow( 'extensions' ); |
| 52 | + $extensions_row = $general_section->getRow( 'extensions' ); |
| 53 | + |
53 | 54 | if ( is_null( $extensions_row ) ) { |
54 | 55 | $extensions_row = new ALRow( 'extensions' ); |
55 | 56 | $general_section->addRow( $extensions_row ); |
56 | 57 | } |
| 58 | + |
57 | 59 | $extensions_row->addItem( ALItem::newFromSpecialPage( 'ReplaceText' ) ); |
| 60 | + |
58 | 61 | return true; |
59 | 62 | } |