r40711 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r40710‎ | r40711 | r40712 >
Date:19:22, 10 September 2008
Author:ialex
Status:old
Tags:
Comment:
Don't throw a fatal error on Special:ViewConfig when efConfigureSetup() isn't called
Modified paths:
  • /trunk/extensions/Configure/CHANGELOG (modified) (history)
  • /trunk/extensions/Configure/Configure.page.php (modified) (history)
  • /trunk/extensions/Configure/Configure.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Configure/Configure.page.php
@@ -77,7 +77,10 @@
7878 }
7979 $this->mWiki = $wiki;
8080 } else {
81 - $this->mWiki = $wgConf->getWiki();
 81+ if( $wgConf instanceof WebConfiguration )
 82+ $this->mWiki = $wgConf->getWiki();
 83+ else
 84+ $this->mWiki = 'default';
8285 }
8386
8487 $this->outputHeader();
@@ -860,7 +863,7 @@
861864 ( isset( $default[$ns] ) ? implode( "\n", (array)$default[$ns] ) : '' ) .
862865 Xml::closeElement( 'textarea' ) . "<br/>\n";
863866 else
864 - $text .= "<pre>" . ( isset( $default[$ns] ) ? htmlspecialchars( implode( "\n", $default[$ns] ) ) : '' ) . "\n</pre>";
 867+ $text .= "<pre>" . ( isset( $default[$ns] ) ? htmlspecialchars( implode( "\n",(array)$default[$ns] ) ) : '' ) . "\n</pre>";
865868 $text .= '</td></tr>';
866869 }
867870 $text .= '</table>';
Index: trunk/extensions/Configure/CHANGELOG
@@ -1,6 +1,10 @@
22 This file lists changes on this extension.
33 Localisation updates are done on betawiki and aren't listed here.
44
 5+0.7.4 - 10 September 2008
 6+ Don't throw a fatal error on Special:ViewConfig when efConfigureSetup() isn't
 7+ called.
 8+
59 0.7.3 - 8 September 2008
610 (bug 14744) Custom rights defined in $wgRestrictionLevels are now configurable
711 in $wgGroupPermissions (require MediaWiki 1.13+).
Index: trunk/extensions/Configure/Configure.php
@@ -17,7 +17,7 @@
1818 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure',
1919 'description' => 'Allow authorised users to configure the wiki by a web-based interface',
2020 'descriptionmsg' => 'configure-desc',
21 - 'version' => '0.7.3',
 21+ 'version' => '0.7.4',
2222 );
2323
2424 ## Configuration part