diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-04 09:25:16 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-04 09:25:16 +0000 |
| commit | 6f7e3053baefce2a27fba376b020c2ed555821b7 (patch) | |
| tree | 73b93f32d667be45e2a5d9ff323572404f1e44cc /lib | |
| parent | 00e7214720cab8b65a39dbea357aaaa58ac9b3bf (diff) | |
| parent | 01795bd615a67d6ad71b3b8240e0151f4c90a374 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 4 | ||||
| -rw-r--r-- | lib/router.php | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/common.php b/lib/common.php index 0b4e03184..016b04481 100644 --- a/lib/common.php +++ b/lib/common.php @@ -19,10 +19,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -define('STATUSNET_VERSION', '0.8.2dev'); +define('STATUSNET_VERSION', '0.8.2rc2'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility -define('STATUSNET_CODENAME', 'Second Guessing'); +define('STATUSNET_CODENAME', 'Life and How to Live It'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48); diff --git a/lib/router.php b/lib/router.php index 7455d9cf8..5529e60ac 100644 --- a/lib/router.php +++ b/lib/router.php @@ -171,10 +171,6 @@ class Router array('action' => 'attachment_thumbnail'), array('attachment' => '[0-9]+')); - $m->connect('getfile/:filename', - array('action' => 'getfile'), - array('filename' => '[A-Za-z0-9._-]+')); - $m->connect('notice/new', array('action' => 'newnotice')); $m->connect('notice/new?replyto=:replyto', array('action' => 'newnotice'), |