Ensure we don't overwrite our CallbackHandler before pulling priority

weierophinney · weierophinney · commit 4bbb48b8afa4 · 2016-03-08T11:39:12.000-06:00
diff --git a/src/Controller/Plugin/Forward.php b/src/Controller/Plugin/Forward.php
@@ -184,8 +184,8 @@ protected function detachProblemListeners(SharedEvents $sharedEvents)
 
                     // zend-eventmanager v2 compatibility:
                     if ($currentCallback instanceof CallbackHandler) {
-                        $currentCallback = $currentCallback->getCallback();
-                        $priority        = $currentCallback->getMetadatum('priority');
+                        $currentCallback = $currentEvent->getCallback();
+                        $priority        = $currentEvent->getMetadatum('priority');
                     }
 
                     // If we have an array, grab the object

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ protected function detachProblemListeners(SharedEvents $sharedEvents)`
`184`	`184`
`185`	`185`	`// zend-eventmanager v2 compatibility:`
`186`	`186`	`if ($currentCallback instanceof CallbackHandler) {`
`187`		`- $currentCallback = $currentCallback->getCallback();`
`188`		`- $priority = $currentCallback->getMetadatum('priority');`
	`187`	`+ $currentCallback = $currentEvent->getCallback();`
	`188`	`+ $priority = $currentEvent->getMetadatum('priority');`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// If we have an array, grab the object`