Ensure $request->hasSession() is always checked before calling getSession()

Arman-Hosseini · Robin Chalas · commit 46bb2196130f · 2019-07-28T18:57:16.000+02:00
diff --git a/Templating/GlobalVariables.php b/Templating/GlobalVariables.php
@@ -75,9 +75,9 @@ public function getRequest()
      */
     public function getSession()
     {
-        if ($request = $this->getRequest()) {
-            return $request->getSession();
-        }
+        $request = $this->getRequest();
+
+        return $request && $request->hasSession() ? $request->getSession() : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,9 @@ public function getRequest()`
`75`	`75`	`*/`
`76`	`76`	`public function getSession()`
`77`	`77`	`{`
`78`		`- if ($request = $this->getRequest()) {`
`79`		`- return $request->getSession();`
`80`		`- }`
	`78`	`+ $request = $this->getRequest();`
	`79`	`+`
	`80`	`+ return $request && $request->hasSession() ? $request->getSession() : null;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`