Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

1 files changed, 22 insertions, 1 deletions

diff --git a/actions/register.php b/actions/register.php
index 5d7a8ce69..aafb54ebb 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -223,10 +223,31 @@ class RegisterAction extends Action
      */
 
     function nicknameExists($nickname)
-    {
+    {        
         $user = User::staticGet('nickname', $nickname);
         return ($user !== false);
     }
+        
+    /**
+     * Handle old fashioned PEAR_Error msgs coming from DB_DataObject
+     *
+     * In this case nickname and email don't exist in the DB yet,
+     * so DB_DataObject throws an error. Overrided from Action.
+     *
+     * @param PEAR_Error 
+     *
+     * @return nothing
+     */
+     
+    function handleError($error) {
+        if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+           
+           // Do nothing.
+                      
+        } else {
+            parent::handleError($error);
+        }
+    }
 
     /**
      * Does the given email address already exist?