Merge branch 'hotfix/4246'

Close zendframework/zendframework#4246
zendframework · Apr 17, 2013 · 0102405 · 0102405
commit 0102405
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php
@@ -353,7 +353,7 @@ public function __call($method, $arguments)
         if (!$result) {
             throw new Exception\BadMethodCallException(sprintf(
                 'Bad method call: Unknown method %s::%s',
-                get_called_class(),
+                get_class($this),
                 $method
             ), 0, $error);
         }

diff --git a/src/Page/AbstractPage.php b/src/Page/AbstractPage.php
@@ -1129,7 +1129,7 @@ public function toArray()
             'privilege' => $this->getPrivilege(),
             'active'    => $this->isActive(),
             'visible'   => $this->isVisible(),
-            'type'      => get_called_class(),
+            'type'      => get_class($this),
             'pages'     => parent::toArray(),
         ));
     }