Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

2010-02-04 13:12:18 -08:00
parent c59eee72a8 ed8553eea8
commit 0d0749e224
1 changed files with 2 additions and 2 deletions
--- a/actions/register.php
+++ b/actions/register.php
@@ -280,7 +280,7 @@ class RegisterAction extends Action
    function nicknameExists($nickname)
    {
        $user = User::staticGet('nickname', $nickname);
-        return ($user !== false);
+        return is_object($user);
    }

    /**
@@ -300,7 +300,7 @@ class RegisterAction extends Action
            return false;
        }
        $user = User::staticGet('email', $email);
-        return ($user !== false);
+        return is_object($user);
    }

    // overrrided to add entry-title class