diff --git a/lib/plugins/authpdo/_test/sqlite.test.php b/lib/plugins/authpdo/_test/sqlite.test.php index f9bcf637066aabd3ededb659b3f9881b0c48b613..e532567c1de997d3d348ab469ea23ce328aefb24 100644 --- a/lib/plugins/authpdo/_test/sqlite.test.php +++ b/lib/plugins/authpdo/_test/sqlite.test.php @@ -195,12 +195,12 @@ class sqlite_plugin_authpdo_test extends DokuWikiTest { $users = $auth->retrieveUsers(0, -1, array('group' => 'admin')); // full group $this->assertEquals(array($expect['admin'], $expect['tester']), $users); - $count = $auth->getUserCount(array('group' => 'admin')); + $count = $auth->getUserCount(array('grps' => 'admin')); $this->assertSame(2, $count); $users = $auth->retrieveUsers(0, -1, array('group' => 'dmi')); // substring $this->assertEquals(array($expect['admin'], $expect['tester']), $users); - $count = $auth->getUserCount(array('group' => 'dmi')); + $count = $auth->getUserCount(array('grps' => 'dmi')); $this->assertSame(2, $count); $users = $auth->retrieveUsers(0, -1, array('user' => 'dmi')); // substring diff --git a/lib/plugins/authpdo/auth.php b/lib/plugins/authpdo/auth.php index 836e599d77f763624e3131f63afa80332f867980..dfe125473d2e7b4ce20be7636ace2fcf50d1a6b4 100644 --- a/lib/plugins/authpdo/auth.php +++ b/lib/plugins/authpdo/auth.php @@ -401,6 +401,7 @@ class auth_plugin_authpdo extends DokuWiki_Auth_Plugin { if($limit < 0) $limit = 10000; // we don't support no limit if(is_null($filter)) $filter = array(); + if(isset($filter['grps'])) $filter['group'] = $filter['grps']; foreach(array('user', 'name', 'mail', 'group') as $key) { if(!isset($filter[$key])) { $filter[$key] = '%'; @@ -434,6 +435,7 @@ class auth_plugin_authpdo extends DokuWiki_Auth_Plugin { public function getUserCount($filter = array()) { if(is_null($filter)) $filter = array(); + if(isset($filter['grps'])) $filter['group'] = $filter['grps']; foreach(array('user', 'name', 'mail', 'group') as $key) { if(!isset($filter[$key])) { $filter[$key] = '%';