From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 23 Mar 2009 19:55:07 +0000 (-0400)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c073a34ce472fc8d0385659a222339a5ba4254a;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x
---

8c073a34ce472fc8d0385659a222339a5ba4254a
diff --cc lib/router.php
index d0b56e88b4,83b3ffe607..5a00a7fea2
--- a/lib/router.php
+++ b/lib/router.php
@@@ -155,14 -159,8 +159,14 @@@ class Route
                      array('action' => 'deletenotice'),
                      array('notice' => '[0-9]+'));
  
 +        // conversation
 +
 +        $m->connect('conversation/:id',
 +                    array('action' => 'conversation'),
 +                    array('id' => '[0-9]+'));
 +
          $m->connect('message/new', array('action' => 'newmessage'));
-         $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]'));
+         $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
          $m->connect('message/:message',
                      array('action' => 'showmessage'),
                      array('message' => '[0-9]+'));