summaryrefslogtreecommitdiff
path: root/modules/user/helpers/group.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-01-03 15:51:24 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-01-03 15:51:24 +0000
commit399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch)
tree592188568e15325d59e51bf19cfdf667fae8d86d /modules/user/helpers/group.php
parent925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff)
parent64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/user/helpers/group.php')
-rw-r--r--modules/user/helpers/group.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 3aaf1b11..2ada0ac1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -31,8 +31,8 @@ class group_Core {
* @return Group_Definition the group object
*/
static function create($name) {
- $group = ORM::factory("group")->where("name", $name)->find();
- if ($group->loaded) {
+ $group = ORM::factory("group")->where("name", "=", $name)->find();
+ if ($group->loaded()) {
throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
}
@@ -86,7 +86,7 @@ class group_Core {
private static function _lookup_by_field($field_name, $value) {
try {
$user = model_cache::get("group", $value, $field_name);
- if ($user->loaded) {
+ if ($user->loaded()) {
return $user;
}
} catch (Exception $e) {