X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/28726e5f11cb46add4e6b86eb9a958798b83c46a..953d8b4b59e8b194bf83b094ecfd9f5e368a04b8:/app/controllers/diary_entries_controller.rb diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index 1a888547d..dd7efc7ca 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -68,7 +68,12 @@ class DiaryEntriesController < ApplicationController @entry = entries.find_by(:id => params[:id]) if @entry @title = t ".title", :user => params[:display_name], :title => @entry.title - @og_image = @entry.body.image + @opengraph_properties = { + "og:image" => @entry.body.image, + "og:image:alt" => @entry.body.image_alt, + "og:description" => @entry.body.description, + "article:published_time" => @entry.created_at.xmlschema + } @comments = can?(:unhide, DiaryComment) ? @entry.comments : @entry.visible_comments else @title = t "diary_entries.no_such_entry.title", :id => params[:id] @@ -125,7 +130,7 @@ class DiaryEntriesController < ApplicationController @title = t "diary_entries.edit.title" @diary_entry = DiaryEntry.find(params[:id]) - if current_user != @diary_entry.user || + if cannot?(:update, @diary_entry) || (params[:diary_entry] && @diary_entry.update(entry_params)) redirect_to diary_entry_path(@diary_entry.user, @diary_entry) else