| Index: trunk/extensions/SimpleSecurity/SimpleSecurity_body.php |
| — | — | @@ -47,8 +47,12 @@ |
| 48 | 48 | # Add extra available groups if $wgSecurityGroupsArticle is set |
| 49 | 49 | if ( $wgSecurityGroupsArticle ) { |
| 50 | 50 | $groups = new Article( Title::newFromText( $wgSecurityGroupsArticle, NS_MEDIAWIKI ) ); |
| 51 | | - if ( preg_match_all( '/^\\*?\\s*(.+?)\\s*$/m', $groups->getContent(), $match ) ) { |
| 52 | | - foreach( $match[1] as $group ) $wgSecurityExtraGroups[$group] = ''; |
| | 51 | + if ( preg_match_all( "/^\*?\s*(.+?)\s*(\|\s*(.+))?$/m", $groups->getContent(), $match ) ) { |
| | 52 | + foreach( $match[1] as $i => $k ) { |
| | 53 | + $v = $match[3][$i]; |
| | 54 | + if ( $v ) $wgSecurityExtraGroups[strtolower( $k )] = $v; |
| | 55 | + else $wgSecurityExtraGroups[$k] = ''; |
| | 56 | + } |
| 53 | 57 | } |
| 54 | 58 | } |
| 55 | 59 | |
| Index: trunk/extensions/SimpleSecurity/SimpleSecurity.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | if ( !defined( 'MEDIAWIKI' ) ) die( 'Not an entry point.' ); |
| 24 | 24 | if ( version_compare( $wgVersion, '1.12.0' ) < 0 ) die( 'Sorry, this extension requires at least MediaWiki version 1.12.0' ); |
| 25 | 25 | |
| 26 | | -define( 'SIMPLESECURITY_VERSION', '4.3.2, 2009-05-06' ); |
| | 26 | +define( 'SIMPLESECURITY_VERSION', '4.3.3, 2009-05-18' ); |
| 27 | 27 | |
| 28 | 28 | # Load the SimpleSecurity class and messages |
| 29 | 29 | $dir = dirname( __FILE__ ) . '/'; |