Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

2 files changed, 4 insertions, 4 deletions

diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 8af78012..4432fc69 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Group_Model extends ORM {
+class Group_Model extends ORM implements Group_Definition {
   protected $has_and_belongs_to_many = array("users");
 
   var $rules = array(
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 55562f34..184ce70a 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class User_Model extends ORM {
+class User_Model extends ORM implements User_Definition {
   protected $has_and_belongs_to_many = array("groups");
 
   var $rules = array(
-    "name" => "length[1,32]",
+    "name" => "required|length[1,32]",
     "full_name" => "length[0,255]",
     "email" => "valid_email|length[1,255]",
     "password" => "length[1,40]",
@@ -82,4 +82,4 @@ class User_Model extends ORM {
   public function display_name() {
     return empty($this->full_name) ? $this->name : $this->full_name;
   }
-}
\ No newline at end of file
+}