Index: trunk/extensions/SemanticForms/SemanticForms.php |
— | — | @@ -78,8 +78,6 @@ |
79 | 79 | |
80 | 80 | $wgExtensionFunctions[] = 'sffSetupExtension'; |
81 | 81 | |
82 | | -// FIXME: Can be removed when new style magic words are used (introduced in r52503) |
83 | | -$wgHooks['LanguageGetMagic'][] = 'SFParserFunctions::languageGetMagic'; |
84 | 82 | $wgHooks['LinkEnd'][] = 'SFFormLinker::setBrokenLink'; |
85 | 83 | $wgHooks['UnknownAction'][] = 'SFFormEditTab::displayForm'; |
86 | 84 | // 'SkinTemplateNavigation' replaced 'SkinTemplateTabs' in the Vector skin |
Index: trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php |
— | — | @@ -141,21 +141,7 @@ |
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | |
145 | | - // FIXME: Can be removed when new style magic words are used (introduced in r52503) |
146 | | - static function languageGetMagic( &$magicWords, $langCode = "en" ) { |
147 | | - switch ( $langCode ) { |
148 | | - default: |
149 | | - $magicWords['forminput'] = array ( 0, 'forminput' ); |
150 | | - $magicWords['formlink'] = array ( 0, 'formlink' ); |
151 | | - $magicWords['arraymap'] = array ( 0, 'arraymap' ); |
152 | | - $magicWords['arraymaptemplate'] = array ( 0, 'arraymaptemplate' ); |
153 | | - $magicWords['autoedit'] = array( 0, 'autoedit' ); |
154 | | - } |
155 | | - return true; |
156 | | - } |
157 | | - |
158 | 145 | static function renderFormLink ( &$parser ) { |
159 | | - |
160 | 146 | global $wgVersion; |
161 | 147 | |
162 | 148 | $params = func_get_args(); |
— | — | @@ -168,19 +154,15 @@ |
169 | 155 | // - support unlabelled params, for backwards compatibility |
170 | 156 | // - parse and sanitize all parameter values |
171 | 157 | foreach ( $params as $i => $param ) { |
172 | | - |
173 | 158 | $elements = explode( '=', $param, 2 ); |
174 | 159 | |
175 | 160 | // set param_name and value |
176 | 161 | if ( count( $elements ) > 1 ) { |
177 | | - |
178 | 162 | $param_name = trim( $elements[0] ); |
179 | 163 | |
180 | 164 | // parse (and sanitize) parameter values |
181 | 165 | $value = trim( $parser->recursiveTagParse( $elements[1] ) ); |
182 | | - |
183 | 166 | } else { |
184 | | - |
185 | 167 | $param_name = null; |
186 | 168 | |
187 | 169 | // parse (and sanitize) parameter values |