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

2 files changed, 1 insertions, 23 deletions

diff --git a/actions/tag.php b/actions/tag.php
index e71ec06a8..e9351d241 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -49,8 +49,6 @@ class TagAction extends Action
     {
         $pop = new PopularNoticeSection($this);
         $pop->show();
-//        $freqatt = new FrequentAttachmentSection($this);
-//        $freqatt->show();
     }
 
     function title()
diff --git a/lib/router.php b/lib/router.php
index d1e2970c5..fc119821b 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -151,10 +151,6 @@ class Router
         $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
                     array('q' => '.+'));
 
-/*
-        $m->connect('attachment/ajax_by_url/*url',
-                    array('action' => 'attachment_ajax'));
-*/
         $m->connect('attachment/:attachment/ajax',
                     array('action' => 'attachment_ajax'),
                     array('attachment' => '[0-9]+'));
@@ -163,27 +159,11 @@ class Router
                     array('action' => 'attachment_thumbnail'),
                     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?replyto=:replyto',
                     array('action' => 'newnotice'),
                     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',
                     array('action' => 'shownotice'),
                     array('notice' => '[0-9]+'));