https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113913
Revision: 113913
Author: yaron
Date: 2012-03-15 13:37:42 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Restored backward-compatibility for MW 1.17 (?), improved display of "more than
one form" warning
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_FormEditAction.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormEditAction.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormEditAction.php
2012-03-15 13:09:50 UTC (rev 113912)
+++ trunk/extensions/SemanticForms/includes/SF_FormEditAction.php
2012-03-15 13:37:42 UTC (rev 113913)
@@ -174,9 +174,18 @@
if ( count( $form_names ) == 0 ) {
return true;
}
+
+ // For backward-compatibility
+ if ( is_string( $action ) ) {
+ global $wgOut;
+ $output = $wgOut;
+ } else {
+ $output = $action->getOutput();
+ }
+
if ( count( $form_names ) > 1 ) {
- $warning_text = "\t" . '<div class="warningMessage">' .
wfMsg( 'sf_formedit_morethanoneform' ) . "</div>\n";
- $action->getOutput()->addHTML( $warning_text );
+ $warning_text = "\t" . '<div class="warningbox">' .
wfMsg( 'sf_formedit_morethanoneform' ) . "</div>\n";
+ $output->addWikiText( $warning_text );
}
$form_name = $form_names[0];
@@ -202,7 +211,7 @@
$msg = $msg[0];
}
- $action->getOutput()->addHTML( Html::element( 'p',
array( 'class' => 'error' ), wfMsg( $msg, $msgdata ) ) );
+ $output->addHTML( Html::element( 'p', array( 'class' =>
'error' ), wfMsg( $msg, $msgdata ) ) );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
