r48344 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48343‎ | r48344 | r48345 >
Date:11:33, 12 March 2009
Author:ialex
Status:ok
Tags:
Comment:
Use only one box even if there're more than one warning
Modified paths:
  • /trunk/extensions/Configure/Configure.ext.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.ext.php
@@ -192,15 +192,29 @@
193193 }
194194 return $ret . "</ul>\n</span>\n</fieldset>";
195195 }
 196+
 197+ $warnings = array();
 198+
196199 if ( $this->mDbChange ) {
197 - $warn = wfMsgExt( 'configure-ext-schemachange', array( 'parseinline' ) );
198 - $ret .= "<span class=\"errorbox\">{$warn}</span><br clear=\"left\" />\n";
 200+ $warnings[] = wfMsgExt( 'configure-ext-schemachange', array( 'parseinline' ) );
199201 }
200202 if ( count( $this->mExtensionsDependencies ) ) {
201203 global $wgLang;
202 - $warn = wfMsgExt( 'configure-ext-ext-dependencies', array( 'parseinline' ), $wgLang->listToText( $this->mExtensionsDependencies ), count( $this->mExtensionsDependencies ) );
203 - $ret .= "<span class=\"errorbox\">{$warn}</span><br clear=\"left\" />\n";
 204+ $warnings[] = wfMsgExt( 'configure-ext-ext-dependencies', array( 'parseinline' ), $wgLang->listToText( $this->mExtensionsDependencies ), count( $this->mExtensionsDependencies ) );
204205 }
 206+
 207+ if ( count( $warnings ) ) {
 208+ $ret .= "<span class=\"errorbox\">\n";
 209+ if ( count( $warnings ) > 1 ) {
 210+ $ret .= "<ul>\n<li>";
 211+ $ret .= implode( "</li>\n<li>", $warnings );
 212+ $ret .= "</li>\n</ul>";
 213+ } else {
 214+ $ret .= $warnings[0];
 215+ }
 216+ $ret .= "</span><br clear=\"left\" />\n";
 217+ }
 218+
205219 $use = wfMsgExt( 'configure-ext-use', array( 'parseinline' ) );
206220 $ret .= "<h2>{$use}</h2>\n";
207221 $ret .= "<table class=\"configure-table configure-table-ext\"><tr><td>\n";

Status & tagging log