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

Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url 

[fixes #391] exception when wrong resource type in URL
This commit is contained in:
Sam 2013-03-24 16:16:34 -07:00
parent ff3028de07 0da8f35659
commit b1d1ab7d2b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -93,7 +93,7 @@ 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.html? if request.format && request.format.html?
if guardian.current_user if guardian.current_user
guardian.current_user.sync_notification_channel_position guardian.current_user.sync_notification_channel_position
end end