about summary refs log tree commit diff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-23 09:20:34 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-23 09:20:34 +0100
commit4bdb6a0eaffb39fb953689729c9fcf772c7128d6 (patch)
treefcd98ede617616ad46cab322735dcd9512e4f08c /app/controllers/application_controller.rb
parent9b53c7d353477e21ce5f3c6b56beb853cc1c0ef2 (diff)
Rename "publish" to "toot" in english locale, fix lightbox showing old image
before loading new one, cache notifications API, fix missing follow button
on public profiles
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 07526d46e..effb4ed78 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -51,6 +51,6 @@ class ApplicationController < ActionController::Base
   end
 
   def current_account
-    @account ||= current_user.try(:account)
+    @current_account ||= current_user.try(:account)
   end
 end