summaryrefslogtreecommitdiff
path: root/modules/user/helpers
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-09-07 18:53:25 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-09-07 18:53:25 -0700
commit5a26dd542a3cb4974870bcfeec4864d1daa616c4 (patch)
treedede0baa9ba893a4987bffc7ddaf925694e5ddde /modules/user/helpers
parentb6fa33faf789749f4de3f4eadf8832748372c980 (diff)
parentd398651c080c18e4f1bf623548091465dac1d528 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/user/helpers')
-rw-r--r--modules/user/helpers/group.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index c84910f1..88bfac35 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -68,13 +68,13 @@ class group_Core {
*/
private static function _lookup_by_field($field_name, $value) {
try {
- $user = model_cache::get("group", $value, $field_name);
- if ($user->loaded()) {
- return $user;
+ $group = model_cache::get("group", $value, $field_name);
+ if ($group->loaded()) {
+ return $group;
}
} catch (Exception $e) {
if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
- throw $e;
+ throw $e;
}
}
return null;