revt toorig

atk4 · Jun 14, 2020 · 0a8668a · 0a8668a
1 parent 4766d2f
commit 0a8668a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/HookTrait.php b/src/HookTrait.php
@@ -136,13 +136,15 @@ public function hook(string $spot, array $args = [], HookBreaker &$brokenBy = nu
 
         $return = [];
         if (isset($this->hooks[$spot])) {
-            ksort($this->hooks[$spot]); // lower priority is called sooner
+            krsort($this->hooks[$spot]); // lower priority is called sooner
+            $hookBackup = $this->hooks[$spot];
 
             try {
+                $bb = $this->_hookActiveSpots[$spot] ?? false;
                 $this->_hookActiveSpots[$spot] = true;
 
-                foreach ($this->hooks[$spot] as $datas) {
-                    foreach ($datas as $index => $data) {
+                while ($_data = array_pop($this->hooks[$spot])) {
+                    foreach ($_data as $index => $data) {
                         $return[$index] = $data[0](...array_merge(
                             [$this],
                             $args,
@@ -155,7 +157,8 @@ public function hook(string $spot, array $args = [], HookBreaker &$brokenBy = nu
 
                 return $e->getReturnValue();
             } finally {
-                $this->_hookActiveSpots[$spot] = false;
+                $this->hooks[$spot] = $hookBackup;
+                $this->_hookActiveSpots[$spot] = $bb;
             }
         }