Indefero Commit Details

Date:

2011-11-30 10:44:03 (13 years 5 months ago)

Author:

Jean-Philippe Fleury

Branch:

develop, release-1.2, release-1.3

Commit:

154597c09c2943be688e915e104d0a8af2e3e0f7

Parents:

8f886155b068f949fe41cdd8f6a87b610e87d900

Message:

Fix issue 763.

Changes:

File differences

-94
95 95
96 96
97 
97
98 98
99 99
100 100
+    {␊
        $this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));␊
        if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']) != null) {␊
            throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need to, click on the help link to recover your password.'), $this->cleaned_data['email']));␊
            throw new Pluf_Form_Invalid(sprintf(__('The email "%1$s" is already used. If you need to, you can <a href="%2$s">recover your password</a>.'), $this->cleaned_data['email'], Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk')));␊
        }␊
        return $this->cleaned_data['email'];␊
    }␊
     {␊
         $this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));␊
         if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']) != null) {␊
-            throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need to, click on the help link to recover your password.'), $this->cleaned_data['email']));␊
+            throw new Pluf_Form_Invalid(sprintf(__('The email "%1$s" is already used. If you need to, you can <a href="%2$s">recover your password</a>.'), $this->cleaned_data['email'], Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk')));␊
         }␊
         return $this->cleaned_data['email'];␊
     }␊

-107
108 108
109 109
110 
110
111 111
112 112
113 113
+            throw new Pluf_Form_Invalid($error);␊
        }␊
        if ($users[0]->active) {␊
            throw new Pluf_Form_Invalid(__('This account has already been confirmed. Maybe should you try to recover your password using the help link.'));␊
            throw new Pluf_Form_Invalid(sprintf(__('This account has already been confirmed. Maybe should you try to <a href="%s">recover your password</a>.'), Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk')));␊
        }␊
        $this->_user_id = $email_id[1];␊
        return $this->cleaned_data['key'];␊
             throw new Pluf_Form_Invalid($error);␊
         }␊
         if ($users[0]->active) {␊
-            throw new Pluf_Form_Invalid(__('This account has already been confirmed. Maybe should you try to recover your password using the help link.'));␊
+            throw new Pluf_Form_Invalid(sprintf(__('This account has already been confirmed. Maybe should you try to <a href="%s">recover your password</a>.'), Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk')));␊
         }␊
         $this->_user_id = $email_id[1];␊
         return $this->cleaned_data['key'];␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags