From d46e6d4a39b003dc6f877fc13913e93da798177a Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 11 Mar 2019 16:43:04 +0100
Subject: [PATCH] simplified some code

---
 src/Environment.php             |  4 +---
 src/Extension/CoreExtension.php | 17 ++---------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/Environment.php b/src/Environment.php
index 11aaf8299..2e0b55ec3 100644
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -454,12 +454,10 @@ class Environment
 
         $this->setLoader($loader);
         try {
-            $template = $this->loadTemplate($name);
+            return $this->loadTemplate($name);
         } finally {
             $this->setLoader($current);
         }
-
-        return $template;
     }
 
     /**
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index 26a4ebfc7..5d5ad3e4b 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1393,30 +1393,17 @@ function twig_include(Environment $env, $context, $template, $variables = [], $w
         }
     }
 
-    $result = '';
     try {
-        $result = $env->resolveTemplate($template)->render($variables);
+        return $env->resolveTemplate($template)->render($variables);
     } catch (LoaderError $e) {
         if (!$ignoreMissing) {
-            if ($isSandboxed && !$alreadySandboxed) {
-                $sandbox->disableSandbox();
-            }
-
             throw $e;
         }
-    } catch (\Throwable $e) {
+    } finally {
         if ($isSandboxed && !$alreadySandboxed) {
             $sandbox->disableSandbox();
         }
-
-        throw $e;
     }
-
-    if ($isSandboxed && !$alreadySandboxed) {
-        $sandbox->disableSandbox();
-    }
-
-    return $result;
 }
 
 /**