| Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php |
| — | — | @@ -974,8 +974,8 @@ |
| 975 | 975 | if ( in_array( 'edittools', $free_text_components ) ) { |
| 976 | 976 | // borrowed from EditPage::showEditTools() |
| 977 | 977 | $options[] = 'parse'; |
| 978 | | - $edittools_text = wfMsgExt( 'edittools', array( 'parse' ), array( 'content' ) ); |
| 979 | | - |
| | 978 | + $edittools_text = $wgParser->recursiveTagParse( wfMsg( 'edittools', array( 'content' ) ) ); |
| | 979 | + |
| 980 | 980 | $new_text .= <<<END |
| 981 | 981 | <div class="mw-editTools"> |
| 982 | 982 | $edittools_text |
| — | — | @@ -1447,6 +1447,7 @@ |
| 1448 | 1448 | $form_text .= $section; |
| 1449 | 1449 | } |
| 1450 | 1450 | $curPlaceholder = null; |
| | 1451 | +// var_dump($wgParser->getOutput()->getModules()); |
| 1451 | 1452 | } // end for |
| 1452 | 1453 | |
| 1453 | 1454 | // Cleanup - everything has been browsed. |
| Index: trunk/extensions/SemanticForms/includes/SF_FormUtils.php |
| — | — | @@ -92,12 +92,15 @@ |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | static function minorEditInputHTML( $is_disabled, $label = null, $attrs = array() ) { |
| 96 | | - global $sfgTabIndex, $wgUser; |
| | 96 | + global $sfgTabIndex, $wgUser, $wgParser; |
| 97 | 97 | |
| 98 | 98 | $sfgTabIndex++; |
| 99 | 99 | $checked = $wgUser->getOption( 'minordefault' ); |
| 100 | | - if ( $label == null ) |
| 101 | | - $label = wfMsgExt( 'minoredit', array( 'parseinline' ) ); |
| | 100 | + |
| | 101 | + if ( $label == null ) { |
| | 102 | + $label = $wgParser->recursiveTagParse( wfMsg( 'minoredit' ) ); |
| | 103 | + } |
| | 104 | + |
| 102 | 105 | $tooltip = wfMsg( 'tooltip-minoredit' ); |
| 103 | 106 | $attrs += array( |
| 104 | 107 | 'id' => 'wpMinoredit', |
| — | — | @@ -117,7 +120,7 @@ |
| 118 | 121 | } |
| 119 | 122 | |
| 120 | 123 | static function watchInputHTML( $is_disabled, $label = null, $attrs = array() ) { |
| 121 | | - global $sfgTabIndex, $wgUser, $wgTitle; |
| | 124 | + global $sfgTabIndex, $wgUser, $wgTitle, $wgParser; |
| 122 | 125 | |
| 123 | 126 | $sfgTabIndex++; |
| 124 | 127 | $checked = ""; |
| — | — | @@ -134,7 +137,7 @@ |
| 135 | 138 | $checked = true; |
| 136 | 139 | } |
| 137 | 140 | if ( $label == null ) |
| 138 | | - $label = wfMsgExt( 'watchthis', array( 'parseinline' ) ); |
| | 141 | + $label = $wgParser->recursiveTagParse( wfMsg( 'watchthis' ) ); |
| 139 | 142 | $attrs += array( |
| 140 | 143 | 'id' => 'wpWatchthis', |
| 141 | 144 | 'accesskey' => wfMsg( 'accesskey-watch' ), |
| — | — | @@ -244,10 +247,10 @@ |
| 245 | 248 | } |
| 246 | 249 | |
| 247 | 250 | static function cancelLinkHTML( $is_disabled, $label = null, $attr = array() ) { |
| 248 | | - global $wgTitle; |
| | 251 | + global $wgTitle, $wgParser; |
| 249 | 252 | |
| 250 | 253 | if ( $label == null ) { |
| 251 | | - $label = wfMsgExt( 'cancel', array( 'parseinline' ) ); |
| | 254 | + $label = $wgParser->recursiveTagParse( wfMsg( 'cancel' ) ); |
| 252 | 255 | } |
| 253 | 256 | if ( $wgTitle == null ) { |
| 254 | 257 | $cancel = ''; |