Merge pull request joomla#3199 from chalet16/patch-1

Make JEventDispatcher compatible with HHVM
Rajoz · Apr 8, 2014 · 8f6de8a · 8f6de8a
2 parents 4f624dc + 791f561
commit 8f6de8a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/joomla/event/dispatcher.php b/libraries/joomla/event/dispatcher.php
@@ -204,7 +204,6 @@ public function attach($observer)
 			}
 
 			$this->_observers[] = $observer;
-			end($this->_observers);
 			$methods = array($observer['event']);
 		}
 		else
@@ -229,6 +228,7 @@ public function attach($observer)
 			$methods = array_diff(get_class_methods($observer), get_class_methods('JPlugin'));
 		}
 
+		end($this->_observers);
 		$key = key($this->_observers);
 
 		foreach ($methods as $method)