TagAction extends ManagedAction

diff --git a/actions/tag.php b/actions/tag.php
index 21cae9aba5127e43a83209fc52da13432f384d7b..5e52630c8556660038f62c3ee1e854c9d1dbc09c 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,26 +17,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 // @todo FIXME: documentation missing.
-class TagAction extends Action
+class TagAction extends ManagedAction
 {
     var $notice;
     var $tag;
     var $page;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
+
         $taginput = $this->trimmed('tag');
         $this->tag = common_canonical_tag($taginput);
 
-        if (!$this->tag) {
+        if (empty($this->tag)) {
             common_redirect(common_local_url('publictagcloud'), 301);
         }
 
-        if ($this->tag != $taginput) {
+        // after common_canonical_tag we have a lowercase, no-specials tag string
+        if ($this->tag !== $taginput) {
             common_redirect(common_local_url('tag', array('tag' => $this->tag)), 301);
         }
 
@@ -69,13 +71,6 @@ class TagAction extends Action
         }
     }
 
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $this->showPage();
-    }
-
     function getFeeds()
     {
         return array(new Feed(Feed::JSON,
@@ -111,7 +106,7 @@ class TagAction extends Action
                                       $this->tag)));
     }
 
-    function showContent()
+    protected function showContent()
     {
         if(Event::handle('StartTagShowContent', array($this))) {