Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2014-09-01 20:39:22 +0400
committerJonne Haß <me@jhass.eu>2014-09-01 20:39:22 +0400
commit644548793660f51b5a52912133431c264ba51d8c (patch)
tree2279a2cbd5fbed0fb9f3b2ce8203595df787fa20 /app
parent1ae0085d645e8c240eacfabd9b2faeb9cbb3b2b5 (diff)
parentba0bccbef186964e0e01fa2d50966026649fb3d9 (diff)
Merge pull request #5193 from svbergerem/conversations-redirect-new
Redirect conversations/new to conversations
Diffstat (limited to 'app')
-rw-r--r--app/controllers/conversations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index 5713a2af5..7a175d315 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -84,7 +84,7 @@ class ConversationsController < ApplicationController
end
def new
- if !params[:facebox] && session[:mobile_view] == false && request.format.html?
+ if !params[:facebox] && !session[:mobile_view] && request.format.html?
redirect_to conversations_path
return
end