http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95936
Revision: 95936
Author: laner
Date: 2011-09-01 05:24:39 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Of course, doesn't work in static functions :). Follow up to r95934
Modified Paths:
--------------
trunk/extensions/OpenStackManager/OpenStackNovaUser.php
Modified: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2011-09-01
05:12:47 UTC (rev 95935)
+++ trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2011-09-01
05:24:39 UTC (rev 95936)
@@ -489,10 +489,9 @@
* @return bool
*/
static function LDAPSetNovaInfo( $auth ) {
- $this->userInfo = $auth->userInfo;
- if ( !$this->exists() ) {
- if ( !in_array( 'novauser',
$this->userInfo[0]['objectclass'] ) ) {
- $values['objectclass'] =
$this->userInfo[0]['objectclass'];
+ if ( !isset( $auth->userInfo[0]['accesskey'] ) or !isset(
$auth->userInfo[0]['secretkey'] ) ) {
+ if ( !in_array( 'novauser',
$auth->userInfo[0]['objectclass'] ) ) {
+ $values['objectclass'] =
$auth->userInfo[0]['objectclass'];
$values['objectclass'][] = 'novauser';
}
$values['accesskey'] = OpenStackNovaUser::uuid4();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
