From 1844f89e636d20d80d8f7b674874d2963388d963 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Tue, 19 Apr 2016 13:23:49 -0400 Subject: [PATCH] Small miscellaneous cleanup --- src/Aviat/AnimeClient/Controller.php | 11 +++++++++-- src/Aviat/Ion/Cache/Driver/SQLDriver.php | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Aviat/AnimeClient/Controller.php b/src/Aviat/AnimeClient/Controller.php index 76ec2408..e53760d3 100644 --- a/src/Aviat/AnimeClient/Controller.php +++ b/src/Aviat/AnimeClient/Controller.php @@ -134,8 +134,15 @@ class Controller { */ 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'); - $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 // the page is one of the form type pages, @@ -149,7 +156,7 @@ class Controller { { $url = ($anime_client->is_view_page()) ? $this->request->url->get() - : $this->request->getServerParams()['HTTP_REFERER']; + : $server_params['HTTP_REFERER']; } $this->session->set('redirect_url', $url); diff --git a/src/Aviat/Ion/Cache/Driver/SQLDriver.php b/src/Aviat/Ion/Cache/Driver/SQLDriver.php index 77ebae65..c8a51dd2 100644 --- a/src/Aviat/Ion/Cache/Driver/SQLDriver.php +++ b/src/Aviat/Ion/Cache/Driver/SQLDriver.php @@ -13,7 +13,6 @@ namespace Aviat\Ion\Cache\Driver; use Aviat\Ion\Di\ContainerInterface; -use Aviat\Ion\Json; use Aviat\AnimeClient\Model\DB; /**