Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"

This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.

app/controllers/users_controller.rb

@@ -21,7 +21,6 @@ class UsersController < ApplicationController
     params[:user].delete(:password) if params[:user][:password].blank?
     params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
     params[:user].delete(:language) if params[:user][:language].blank?
-    params[:user].delete(:email) if params[:user][:email].blank?
 
     # change email notifications
     if params[:user][:disable_mail]
@@ -40,13 +39,6 @@ class UsersController < ApplicationController
       else
         flash[:error] = I18n.t 'users.update.language_not_changed'
       end
-    # change email
-    elsif params[:user][:email]
-      if @user.update_attributes(:email => params[:user][:email])
-        flash[:notice] = I18n.t 'users.update.email_changed'
-      else
-        flash[:error] = I18n.t 'users.update.email_not_changed'
-      end
     end
 
     redirect_to edit_user_path(@user)

app/models/user.rb

@@ -61,7 +61,7 @@ class User
     person.save if person
   end
 
-  attr_accessible :getting_started, :password, :password_confirmation, :language, :disable_mail, :email
+  attr_accessible :getting_started, :password, :password_confirmation, :language, :disable_mail
 
   def strip_and_downcase_username
     if username.present?

app/views/users/edit.html.haml

@@ -37,12 +37,8 @@
   .span-8.last
     %h3
       = t('.your_email')
-    = form_for @user do |f|
+    %p
-      = f.error_messages
+      = current_user.email
-      %p
-        = f.label :email, current_user.email
-        = f.text_field :email
-        = f.submit t('.change_email')
 
   %br
   %br

config/locales/diaspora/en.yml

@@ -176,7 +176,6 @@ en:
           close_account: "Close Account"
           change_language: "Change Language"
           change_password: "Change Password"
-          change_email: "Change Email"
           new_password: "New Password"
           download_xml: "download my xml"
           download_photos: "download my photos"
@@ -221,8 +220,6 @@ en:
           language_changed: "Language Changed"
           language_not_changed: "Language Change Failed"
           email_notifications_changed: "Language Change Failed"
-          email_changed: "Email Changed"
-          email_not_changed: "Email Change Failed"
       public:
           does_not_exist: "User %{username} does not exist!"
   comments: