From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 21 Feb 2009 15:10:33 +0000 (-0800)
Subject: Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da532bae9131b6dec8f5c0d67ce77c4ad1736f7d;p=quix0rs-gnu-social.git

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
---

da532bae9131b6dec8f5c0d67ce77c4ad1736f7d
diff --cc lib/router.php
index 85425bed29,9d0d3a3f06..e842604e9a
--- a/lib/router.php
+++ b/lib/router.php
@@@ -347,10 -358,19 +360,19 @@@ class Route
  
      function map($path)
      {
-         return $this->m->match($path);
+         try {
+             $match = $this->m->match($path);
+         } catch (Net_URL_Mapper_InvalidException $e) {
+             common_log(LOG_ERR, "Problem getting route for $path - " .
+                 $e->getMessage());
+             $cac = new ClientErrorAction("Page not found.", 404);
+             $cac->showPage();
+         }
+ 
+         return $match;
      }
  
 -    function build($action, $args=null, $fragment=null)
 +    function build($action, $args=null, $params=null, $fragment=null)
      {
          $action_arg = array('action' => $action);