Merge branch 'master' into 1.1

Gnuckorg · Sep 28, 2015 · c45bd9a · c45bd9a
2 parents b6c4606 + 1487200
commit c45bd9a
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Controller/UserController.php b/Controller/UserController.php
@@ -467,9 +467,13 @@ protected function formatRawData(Request $request, $raw, array $oldRaw = array()
      */
     protected function getAuthspace(Request $request)
     {
-        $client = $this->getClient($request);
+        try {
+            $client = $this->getClient($request);
+        } catch (NotFoundHttpException $e) {
+            // Can have no client.
+        }
 
-        if (null === $client) {
+        if (!isset($client)) {
             return;
         }
 
@@ -525,9 +529,13 @@ protected function getClient(Request $request)
      */
     protected function canPerformWithoutAuthspace(Request $request)
     {
-        $client = $this->getClient($request);
+        try {
+            $client = $this->getClient($request);
+        } catch (NotFoundHttpException $e) {
+            // Can have no client.
+        }
 
-        if (null === $client) {
+        if (!isset($client)) {
             return false;
         }