Merge branch 'stable' into develop

Changelog.md

@@ -129,9 +129,10 @@ Contributions are very welcome, the hard work is done!
 ## Bug fixes
 * Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706)
 * Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
+* Only mark unread notifications as read [#6711](https://github.com/diaspora/diaspora/pull/6711)
 
 ## Features
-* Added the footer to conversation pages
+* Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710)
 
 # 0.5.7.0
 

app/controllers/notifications_controller.rb

@@ -61,9 +61,9 @@ class NotificationsController < ApplicationController
 
   def read_all
     current_type = Notification.types[params[:type]]
-    notifications = Notification.where(:recipient_id => current_user.id)
-    notifications = notifications.where(:type => current_type) if params[:type]
-    notifications.update_all(:unread => false)
+    notifications = Notification.where(recipient_id: current_user.id, unread: true)
+    notifications = notifications.where(type: current_type) if params[:type]
+    notifications.update_all(unread: false)
     respond_to do |format|
       if current_user.unread_notifications.count > 0
         format.html { redirect_to notifications_path }
@@ -75,7 +75,6 @@ class NotificationsController < ApplicationController
       format.xml { render :xml => {}.to_xml }
       format.json { render :json => {}.to_json }
     end
-
   end
 
 end