summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorBrenda Wallace <shiny@cpan.org>2009-10-30 09:41:04 +1300
committerBrenda Wallace <shiny@cpan.org>2009-10-30 09:41:04 +1300
commitc0f8c0178a3cccead97fb0800a514b0ac9dbde64 (patch)
tree9d2f26feccaa85e73a7bc4985a1f899d9b89f730 /lib/router.php
parent7f5fbee2e36889fae1d1c5043d76625e197e39ea (diff)
parent24c3a15124ab866bf7e9401f638156e102074608 (diff)
Merge commit 'mainline/0.9.x' into 0.9.x
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index dedf73c86..2fd255fe6 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -179,6 +179,8 @@ class Router
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
+ $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
+
// conversation
$m->connect('conversation/:id',