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

1 files changed, 0 insertions, 22 deletions

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 0a86aa66d..b84acb214 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -487,26 +487,4 @@ class EmailsettingsAction extends AccountSettingsAction
             return $other->id != $user->id;
         }
     }
-    
-    /**
-     * Handle old fashioned PEAR_Error msgs coming from DB_DataObject
-     *
-     * In this case 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);
-        }
-    }
-    
 }