Merge branch 'hotfix/get-called-class-changes'

Close #4236 Close #4237
zendframework · Apr 15, 2013 · eda566b · eda566b
2 parents 9c7168c + ce44f24
commit eda566b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/EventManager/ProvidesEvents.php b/library/Zend/EventManager/ProvidesEvents.php
@@ -29,7 +29,7 @@ trait ProvidesEvents
      */
     public function setEventManager(EventManagerInterface $events)
     {
-        $identifiers = array(__CLASS__, get_called_class());
+        $identifiers = array(__CLASS__, get_class($this));
         if (isset($this->eventIdentifier)) {
             if ((is_string($this->eventIdentifier))
                 || (is_array($this->eventIdentifier))

diff --git a/library/Zend/ModuleManager/ModuleManager.php b/library/Zend/ModuleManager/ModuleManager.php
@@ -245,7 +245,7 @@ public function setEventManager(EventManagerInterface $events)
     {
         $events->setIdentifiers(array(
             __CLASS__,
-            get_called_class(),
+            get_class($this),
             'module_manager',
         ));
         $this->events = $events;