Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Include preloaded data even if the request type isn't explicitly text/html

This commit is contained in:
Robin Ward 2013-06-04 12:56:12 -04:00
parent 4392a17b54
commit 02b1f78410
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -97,7 +97,10 @@ class ApplicationController < ActionController::Base
# If we are rendering HTML, preload the session data # If we are rendering HTML, preload the session data
def preload_json def preload_json
if request.format && request.format.html?
# We don't preload JSON on xhr or JSON request
return if request.xhr?
if guardian.current_user if guardian.current_user
guardian.current_user.sync_notification_channel_position guardian.current_user.sync_notification_channel_position
end end
@ -112,7 +115,6 @@ class ApplicationController < ActionController::Base
end end
store_preloaded("siteSettings", SiteSetting.client_settings_json) store_preloaded("siteSettings", SiteSetting.client_settings_json)
end end
end
def inject_preview_style def inject_preview_style