Merge remote-tracking branch 'weierophinney/feature/error-suppression…

…-removal'
zendframework · Jul 13, 2012 · 33bf9c0 · 33bf9c0
5 parents a5ce396 + 3729984 + 698dbe0 + 0efca0b + d95ed53
commit 33bf9c0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Helper/Navigation/Links.php b/src/Helper/Navigation/Links.php
@@ -15,6 +15,7 @@
 use Zend\Navigation\AbstractContainer;
 use Zend\Navigation\Page\AbstractPage;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\ErrorHandler;
 use Zend\View;
 use Zend\View\Exception;
 
@@ -127,7 +128,10 @@ public function __invoke($container = null)
      */
     public function __call($method, array $arguments = array())
     {
-        if (@preg_match('/find(Rel|Rev)(.+)/', $method, $match)) {
+        ErrorHandler::start(E_WARNING);
+        $result = preg_match('/find(Rel|Rev)(.+)/', $method, $match);
+        ErrorHandler::stop();
+        if ($result) {
             return $this->findRelation($arguments[0],
                                        strtolower($match[1]),
                                        strtolower($match[2]));