Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 4432fc69..515788a3 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -20,7 +20,7 @@
 class Group_Model extends ORM implements Group_Definition {
   protected $has_and_belongs_to_many = array("users");
 
-  var $rules = array(
+  var $form_rules = array(
     "name" => "required|length[4,255]");
 
   /**
@@ -33,8 +33,12 @@ class Group_Model extends ORM implements Group_Definition {
     module::event("group_deleted", $old);
   }
 
+  public function users() {
+    return $this->users->find_all();
+  }
+
   public function save() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
         $created = 1;
     }
     parent::save();