Mirrors/Sequenzia
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed ApplicationController#notice

Browse Source 
I realized that the notice cookie was being sent right when calling the notice method, while in Moebooru the cookie is actually sent on the next request.
This commit is contained in:
Parziphal 2013-12-31 10:20:27 -05:00
parent 33e86da790
commit 0cf2e4a481
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/ApplicationController.php
View File

@ -280,8 +280,9 @@ class ApplicationController extends Rails\ActionController\Base
protected function init_cookies() protected function init_cookies()
{ {
if ($this->request()->format() == "xml" || $this->request()->format() == "json") if ($this->request()->format() == "xml" || $this->request()->format() == "json") {
return; return;
}
$forum_posts = ForumPost::where("parent_id IS NULL")->order("updated_at DESC")->limit(10)->take(); $forum_posts = ForumPost::where("parent_id IS NULL")->order("updated_at DESC")->limit(10)->take();
$this->cookies()->current_forum_posts = json_encode(array_map(function($fp) { $this->cookies()->current_forum_posts = json_encode(array_map(function($fp) {
@ -330,6 +331,11 @@ class ApplicationController extends Rails\ActionController\Base
$this->cookies()->delete('login'); $this->cookies()->delete('login');
$this->cookies()->blacklisted_tags = json_encode(CONFIG()->default_blacklists); $this->cookies()->blacklisted_tags = json_encode(CONFIG()->default_blacklists);
} }
if ($this->session()->notice) {
$this->cookies()->notice = $this->session()->notice;
$this->session()->delete('notice');
}
} }
protected function set_title($title = null) protected function set_title($title = null)
@ -343,7 +349,7 @@ class ApplicationController extends Rails\ActionController\Base
protected function notice($str) protected function notice($str)
{ {
$this->cookies()->notice = $str; $this->session()->notice = $str;
} }
protected function set_locale() protected function set_locale()