https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113101
Revision: 113101
Author: foxtrott
Date: 2012-03-05 22:50:13 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
bugfix (SF cleans out modules of parsed forms)
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
trunk/extensions/SemanticForms/includes/SF_FormUtils.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-03-05
22:45:56 UTC (rev 113100)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-03-05
22:50:13 UTC (rev 113101)
@@ -974,8 +974,8 @@
if ( in_array(
'edittools', $free_text_components ) ) {
// borrowed
from EditPage::showEditTools()
$options[] =
'parse';
- $edittools_text
= wfMsgExt( 'edittools', array( 'parse' ), array( 'content' ) );
-
+ $edittools_text
= $wgParser->recursiveTagParse( wfMsg( 'edittools', array( 'content' ) ) );
+
$new_text .=
<<<END
<div class="mw-editTools">
$edittools_text
@@ -1447,6 +1447,7 @@
$form_text .= $section;
}
$curPlaceholder = null;
+// var_dump($wgParser->getOutput()->getModules());
} // end for
// Cleanup - everything has been browsed.
Modified: trunk/extensions/SemanticForms/includes/SF_FormUtils.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormUtils.php 2012-03-05
22:45:56 UTC (rev 113100)
+++ trunk/extensions/SemanticForms/includes/SF_FormUtils.php 2012-03-05
22:50:13 UTC (rev 113101)
@@ -92,12 +92,15 @@
}
static function minorEditInputHTML( $is_disabled, $label = null, $attrs
= array() ) {
- global $sfgTabIndex, $wgUser;
+ global $sfgTabIndex, $wgUser, $wgParser;
$sfgTabIndex++;
$checked = $wgUser->getOption( 'minordefault' );
- if ( $label == null )
- $label = wfMsgExt( 'minoredit', array( 'parseinline' )
);
+
+ if ( $label == null ) {
+ $label = $wgParser->recursiveTagParse( wfMsg(
'minoredit' ) );
+ }
+
$tooltip = wfMsg( 'tooltip-minoredit' );
$attrs += array(
'id' => 'wpMinoredit',
@@ -117,7 +120,7 @@
}
static function watchInputHTML( $is_disabled, $label = null, $attrs =
array() ) {
- global $sfgTabIndex, $wgUser, $wgTitle;
+ global $sfgTabIndex, $wgUser, $wgTitle, $wgParser;
$sfgTabIndex++;
$checked = "";
@@ -134,7 +137,7 @@
$checked = true;
}
if ( $label == null )
- $label = wfMsgExt( 'watchthis', array( 'parseinline' )
);
+ $label = $wgParser->recursiveTagParse( wfMsg(
'watchthis' ) );
$attrs += array(
'id' => 'wpWatchthis',
'accesskey' => wfMsg( 'accesskey-watch' ),
@@ -244,10 +247,10 @@
}
static function cancelLinkHTML( $is_disabled, $label = null, $attr =
array() ) {
- global $wgTitle;
+ global $wgTitle, $wgParser;
if ( $label == null ) {
- $label = wfMsgExt( 'cancel', array( 'parseinline' ) );
+ $label = $wgParser->recursiveTagParse( wfMsg( 'cancel'
) );
}
if ( $wgTitle == null ) {
$cancel = '';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
