X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/addf99f1911ec617ba258e075a53d774dee2a672..0c13214cd07416fbc4f8c9e20a827a3ae227842f:/app/controllers/diary_entries_controller.rb diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index ff6686448..8da0842eb 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -58,7 +58,7 @@ class DiaryEntriesController < ApplicationController @params = params.permit(:display_name, :friends, :nearby, :language) - @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, [:user, :language]) + @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language]) end def show @@ -247,7 +247,7 @@ class DiaryEntriesController < ApplicationController @params = params.permit(:display_name, :before, :after) - @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, [:user]) + @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user]) end private