]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 23 Mar 2009 19:55:07 +0000 (15:55 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 23 Mar 2009 19:55:07 +0000 (15:55 -0400)
1  2 
README
classes/Notice.php
lib/action.php
lib/router.php

diff --cc README
Simple merge
Simple merge
diff --cc lib/action.php
Simple merge
diff --cc lib/router.php
index d0b56e88b4fb2cddb7b5aa3be6320de85a60d304,83b3ffe607ebd009447d97f16b34baa7b0ddf5fd..5a00a7fea21ef0b307260f3c101d31435823ce27
@@@ -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]+'));