Standardize the use of the lookup methods

2 files changed, 7 insertions, 7 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 567b2ee4..e65b6c96 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -65,7 +65,7 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return self::lookup_by_field("id", $id);
+    return self::_lookup_by_field("id", $id);
   }
 
   /**
@@ -74,7 +74,7 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return self::lookup_by_field("name", $name);
+    return self::_lookup_by_field("name", $name);
   }
 
   /**
@@ -83,7 +83,7 @@ class group_Core {
    * @param string      $value value to match
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
-  static function lookup_by_field($field_name, $value) {
+  private function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
       if ($user->loaded) {
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 026f04e9..c789e8ea 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -70,14 +70,14 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::lookup_user.
    */
   public function lookup_user($id) {
-    return user::lookup_by_field("id", $id);
+    return user::lookup($id);
   }
 
   /**
    * @see IdentityProvider_Driver::lookup_user_by_name.
    */
   public function lookup_user_by_name($name) {
-    return user::lookup_by_field("name", $name);
+    return user::lookup_by_name($name);
   }
 
   /**
@@ -105,14 +105,14 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::lookup_group.
    */
   public function lookup_group($id) {
-    return group::lookup_by_field("id", $id);
+    return group::lookup($id);
   }
 
   /**
    * @see IdentityProvider_Driver::lookup_group_by_name.
    */
   public function lookup_group_by_name($name) {
-    return group::lookup_by_field("name", $name);
+    return group::lookup_by_name($name);
   }
 
   /**