improved callback code

This commit is contained in:
Steffen Schröder 2014-05-07 23:00:21 +02:00
parent c58298a0bd
commit df7c025aaa

View File

@ -120,11 +120,10 @@ class CallbackManager {
$removed = false; $removed = false;
foreach ($this->callbackListeners as &$listeners) { foreach ($this->callbackListeners as &$listeners) {
foreach ($listeners as $key => &$listenerCallback) { foreach ($listeners as $key => &$listenerCallback) {
if ($listenerCallback[0] != $listener) { if ($listenerCallback[0] === $listener) {
continue; unset($listeners[$key]);
$removed = true;
} }
unset($listeners[$key]);
$removed = true;
} }
} }
return $removed; return $removed;
@ -140,11 +139,10 @@ class CallbackManager {
$removed = false; $removed = false;
foreach ($this->scriptCallbackListener as &$listeners) { foreach ($this->scriptCallbackListener as &$listeners) {
foreach ($listeners as $key => &$listenerCallback) { foreach ($listeners as $key => &$listenerCallback) {
if ($listenerCallback[0] != $listener) { if ($listenerCallback[0] === $listener) {
continue; unset($listeners[$key]);
$removed = true;
} }
unset($listeners[$key]);
$removed = true;
} }
} }
return $removed; return $removed;