timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1844f89e63 - Show all commits

11
src/Aviat/AnimeClient/Controller.php
View File

@ -134,8 +134,15 @@ class Controller {
*/ */
public function set_session_redirect($url = NULL) public function set_session_redirect($url = NULL)
{ {
$server_params = $this->request->getServerParams();
if ( ! array_key_exists('HTTP_REFERER', $server_params))
{
return;
}
$anime_client = $this->container->get('anime-client'); $anime_client = $this->container->get('anime-client');
$double_form_page = $this->request->getServerParams()['HTTP_REFERER'] == $this->request->getUri(); $double_form_page = $server_params['HTTP_REFERER'] == $this->request->getUri();
// Don't attempt to set the redirect url if // Don't attempt to set the redirect url if
// the page is one of the form type pages, // the page is one of the form type pages,
@ -149,7 +156,7 @@ class Controller {
{ {
$url = ($anime_client->is_view_page()) $url = ($anime_client->is_view_page())
? $this->request->url->get() ? $this->request->url->get()
: $this->request->getServerParams()['HTTP_REFERER']; : $server_params['HTTP_REFERER'];
} }
$this->session->set('redirect_url', $url); $this->session->set('redirect_url', $url);

1
src/Aviat/Ion/Cache/Driver/SQLDriver.php
View File

@ -13,7 +13,6 @@
namespace Aviat\Ion\Cache\Driver; namespace Aviat\Ion\Cache\Driver;
use Aviat\Ion\Di\ContainerInterface; use Aviat\Ion\Di\ContainerInterface;
use Aviat\Ion\Json;
use Aviat\AnimeClient\Model\DB; use Aviat\AnimeClient\Model\DB;
/** /**