Merge pull request #276 from johanmeiring/fix-php-7.2

Fix problem related to session-handling in PHP 7.2
FriendsOfCake · Oct 31, 2018 · 44451b4 · 44451b4
2 parents 710a838 + ad0378c
commit 44451b4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Pdf/CakePdf.php b/src/Pdf/CakePdf.php
@@ -7,6 +7,7 @@
 use Cake\Core\Exception\Exception;
 use Cake\Filesystem\File;
 use Cake\Http\ServerRequestFactory;
+use Cake\Routing\Router;
 
 class CakePdf
 {
@@ -953,8 +954,13 @@ protected function _render()
             $viewOptions[$var] = $this->{$prop};
         }
 
+        $request = Router::getRequest(true);
+        if (!$request) {
+            $request = ServerRequestFactory::fromGlobals();
+        }
+
         $View = new $viewClass(
-            ServerRequestFactory::fromGlobals(),
+            $request,
             null,
             null,
             $viewOptions