Merge branch 'master' into talmdal_dev

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

2 files changed, 7 insertions, 7 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) {
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f9f16da5..e092aecc 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -44,8 +44,8 @@ class user_Core {
    * @return User_Model
    */
   static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
+    $user = ORM::factory("user")->where("name", "=", $name)->find();
+    if ($user->loaded()) {
       throw new Exception("@todo USER_ALREADY_EXISTS $name");
     }
 
@@ -86,7 +86,7 @@ class user_Core {
     }
 
     // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
+    $sanitizedPassword = html::chars($password, false);
     $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
           : ($salt . md5($salt . $sanitizedPassword));
     if (!strcmp($guess, $valid)) {
@@ -163,7 +163,7 @@ class user_Core {
   private static function _lookup_user_by_field($field_name, $value) {
     try {
       $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
+      if ($user->loaded()) {
         return $user;
       }
     } catch (Exception $e) {