Merge pull request #6721 from isaacaskew/patch-1

Update View.php to avoid setting variables that are never used.

src/View/View.php

@@ -494,11 +494,10 @@ class View implements EventDispatcherInterface
             return $this->Blocks->get('content');
         }
 
-        if (empty($content)) {
-            $content = $this->Blocks->get('content');
-        } else {
-            $this->Blocks->set('content', $content);
+        if (!empty($content)) {
+             $this->Blocks->set('content', $content);
         }
+
         $this->dispatchEvent('View.beforeLayout', [$layoutFileName]);
 
         $title = $this->Blocks->get('title');