r97561 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97560‎ | r97561 | r97562 >
Date:21:25, 19 September 2011
Author:reedy
Status:deferred
Tags:
Comment:
if $wgAuth isn't the LDAP stuff, die with a semi useful error message
Modified paths:
  • /trunk/extensions/OpenStackManager/OpenStackNovaUser.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
@@ -266,6 +266,9 @@
267267 global $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword;
268268 global $wgOpenStackManagerLDAPDomain;
269269
 270+ if ( !$wgAuth instanceof LdapAuthenticationPlugin ) {
 271+ die( 'Install and configure the <a href="http://www.mediawiki.org/wiki/Extension:LDAP_Authentication">LDAP Authentication</a> extension' );
 272+ }
270273 $wgAuth->connect( $wgOpenStackManagerLDAPDomain );
271274 $wgAuth->bindAs( $wgOpenStackManagerLDAPUser, $wgOpenStackManagerLDAPUserPassword );
272275 }

Status & tagging log