Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/admin_users.php
	modules/gallery/controllers/password.php
	modules/gallery/helpers/group.php
	modules/gallery/helpers/user.php
	modules/notification/helpers/notification.php

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index 074a7b83..17dd7f70 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -91,7 +91,7 @@ class group_Core {
    * @return Group_Model  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return Identity::instance()->lookup_group($id);
+    return Identity::instance()->lookup_group_by_field("id", $id);
   }
 
   /**
@@ -100,16 +100,16 @@ class group_Core {
    * @return Group_Core  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return Identity::instance()->lookup_group_by_name($name);
+    return Identity::instance()->lookup_group_by_field("name", $name);
   }
 
   /**
    * List the groups
-   * @param mixed      options to apply to the selection of the user
+   * @param mixed      options to apply to the selection of the user (@see Database.php)
    * @return array     the group list.
    */
-  static function groups($filter=array()) {
-    return Identity::instance()->list_groups($filter);
+  static function get_group_list($filter=array()) {
+    return Identity::instance()->get_group_list($filter);
   }
 
   /**