Throw the actual exception when using a modifier, if one exists, so w…

…e can see the right stack trace
statamic · Nov 5, 2020 · 0c443f7 · 0c443f7
1 parent a569c43
commit 0c443f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Modifiers/Modify.php b/src/Modifiers/Modify.php
@@ -157,7 +157,7 @@ public function modify($modifier, $params = [])
         } catch (Exception $e) {
             // If a modifier's code raised an exception, we'll just
             // catch it here and rethrow it as a ModifierException.
-            $e = new ModifierException($e->getMessage());
+            $e = new ModifierException($e->getMessage(), 0, $e);
             $e->setModifier($modifier);
             throw $e;
         }

diff --git a/src/View/Antlers/Parser.php b/src/View/Antlers/Parser.php
@@ -1458,7 +1458,7 @@ protected function runModifier($modifier, $data, $parameters, $context = [])
         try {
             return Modify::value($value)->context($context)->$modifier($parameters)->fetch();
         } catch (ModifierException $e) {
-            throw_if(config('app.debug'), $e);
+            throw_if(config('app.debug'), ($prev = $e->getPrevious()) ? $prev : $e);
             Log::notice(sprintf('Error in [%s] modifier: %s', $e->getModifier(), $e->getMessage()));
 
             return $value;