Browse Source

Merge pull request #2427 from EliuFlorez/patch-3

Cast implemented events to an array when detaching listeners.

This makes it much simpler to work with mocks, and avoids warnings caused by developer error.
Mark Story 12 years ago
parent
commit
58317d312c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      lib/Cake/Event/CakeEventManager.php

+ 1 - 1
lib/Cake/Event/CakeEventManager.php

@@ -197,7 +197,7 @@ class CakeEventManager {
  * @return void
  */
 	protected function _detachSubscriber(CakeEventListener $subscriber, $eventKey = null) {
-		$events = $subscriber->implementedEvents();
+		$events = (array)$subscriber->implementedEvents();
 		if (!empty($eventKey) && empty($events[$eventKey])) {
 			return;
 		} elseif (!empty($eventKey)) {