From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 1 Mar 2009 05:11:16 +0000 (-0800)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fc44c9a7f456a146a20884c56676baf7343dd923;p=quix0rs-gnu-social.git

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

fc44c9a7f456a146a20884c56676baf7343dd923
diff --cc lib/router.php
index 4c036e7b24,4b70c01505..1d1a5ba4c0
--- a/lib/router.php
+++ b/lib/router.php
@@@ -143,13 -153,8 +153,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/:message',
                      array('action' => 'showmessage'),
                      array('message' => '[0-9]+'));