Merge remote-tracking branch 'prolic/navigation'

jeremiahsmall · May 27, 2012 · 3a1497d · 3a1497d
2 parents 3c47160 + 0793412
commit 3a1497d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/Navigation/Container.php b/library/Zend/Navigation/Container.php
@@ -367,7 +367,7 @@ public function __call($method, $arguments)
         throw new Exception\BadMethodCallException(
             sprintf(
                 'Bad method call: Unknown method %s::%s',
-                get_class($this),
+                get_called_class(),
                 $method
             )
         );

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