ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed rare bug in prev/next post

Browse source 
If tag/user/whatever from last search was deleted after viewing a post,
refreshing the page with that post would yield "Invalid tag/user/whatever"
error.

I changed it so that when retrieving previous/next post for latest search query
throws any errors, saved search query gets resetted to empty one.
This commit is contained in:
Marcin Kurczewski 2013-12-01 14:47:35 +01:00
parent 0001d38699
commit 4c1bb44e59
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Controllers/PostController.php
View file

@ -452,18 +452,27 @@ class PostController
'ownComment.commenter' => 'user']); 'ownComment.commenter' => 'user']);
R::preload($this->context->user, ['ownFavoritee']); R::preload($this->context->user, ['ownFavoritee']);
$this->context->transport->lastSearchQuery = InputHelper::get('last-search-query');
if ($post->hidden) if ($post->hidden)
PrivilegesHelper::confirmWithException(Privilege::ViewPost, 'hidden'); PrivilegesHelper::confirmWithException(Privilege::ViewPost, 'hidden');
PrivilegesHelper::confirmWithException(Privilege::ViewPost); PrivilegesHelper::confirmWithException(Privilege::ViewPost);
PrivilegesHelper::confirmWithException(Privilege::ViewPost, PostSafety::toString($post->safety)); PrivilegesHelper::confirmWithException(Privilege::ViewPost, PostSafety::toString($post->safety));
Model_Post_QueryBuilder::enableTokenLimit(false); Model_Post_QueryBuilder::enableTokenLimit(false);
try
{
$this->context->transport->lastSearchQuery = InputHelper::get('last-search-query');
$prevPostQuery = $this->context->transport->lastSearchQuery . ' prev:' . $id; $prevPostQuery = $this->context->transport->lastSearchQuery . ' prev:' . $id;
$nextPostQuery = $this->context->transport->lastSearchQuery . ' next:' . $id; $nextPostQuery = $this->context->transport->lastSearchQuery . ' next:' . $id;
$prevPost = current(Model_Post::getEntities($prevPostQuery, 1, 1)); $prevPost = current(Model_Post::getEntities($prevPostQuery, 1, 1));
$nextPost = current(Model_Post::getEntities($nextPostQuery, 1, 1)); $nextPost = current(Model_Post::getEntities($nextPostQuery, 1, 1));
}
#search for some reason was invalid, e.g. tag was deleted in the meantime
catch (Exception $e)
{
$this->context->transport->lastSearchQuery = '';
$prevPost = current(Model_Post::getEntities('prev:' . $id, 1, 1));
$nextPost = current(Model_Post::getEntities('next:' . $id, 1, 1));
}
Model_Post_QueryBuilder::enableTokenLimit(true); Model_Post_QueryBuilder::enableTokenLimit(true);
$favorite = $this->context->user->hasFavorited($post); $favorite = $this->context->user->hasFavorited($post);