GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x

Browse Source
This commit is contained in:
Sarven Capadisli 2009-05-25 15:53:49 -04:00
commit 959dce823f
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/tag.php
View File

@ -49,8 +49,6 @@ class TagAction extends Action
{ {
$pop = new PopularNoticeSection($this); $pop = new PopularNoticeSection($this);
$pop->show(); $pop->show();
// $freqatt = new FrequentAttachmentSection($this);
// $freqatt->show();
} }
function title() function title()

22
lib/router.php
View File

@ -151,10 +151,6 @@ class Router
$m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'), $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
array('q' => '.+')); array('q' => '.+'));
/*
$m->connect('attachment/ajax_by_url/*url',
array('action' => 'attachment_ajax'));
*/
$m->connect('attachment/:attachment/ajax', $m->connect('attachment/:attachment/ajax',
array('action' => 'attachment_ajax'), array('action' => 'attachment_ajax'),
array('attachment' => '[0-9]+')); array('attachment' => '[0-9]+'));
@ -163,27 +159,11 @@ class Router
array('action' => 'attachment_thumbnail'), array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+')); array('attachment' => '[0-9]+'));
/*
TODO
not used right now, will revisit later
$m->connect('attachment/:attachment',
array('action' => 'attachment'),
array('attachment' => '[0-9]+'));
*/
// notice
$m->connect('notice/new', array('action' => 'newnotice')); $m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/new?replyto=:replyto', $m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'), array('action' => 'newnotice'),
array('replyto' => '[A-Za-z0-9_-]+')); array('replyto' => '[A-Za-z0-9_-]+'));
/*
$m->connect('notice/:notice/attachments/ajax',
array('action' => 'attachments_ajax'),
array('notice' => '[0-9]+'));
$m->connect('notice/:notice/attachments',
array('action' => 'attachments'),
array('notice' => '[0-9]+'));
*/
$m->connect('notice/:notice', $m->connect('notice/:notice',
array('action' => 'shownotice'), array('action' => 'shownotice'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));