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

[quix0rs-gnu-social.git] / plugins / WikiHashtagsPlugin.php

diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 4d386e19860184f9299d4e25c5159a6a34a5f45c..6d186a5fed43766766f43be1c2b19bc0beb11d82 100644 (file)
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -54,41 +54,41 @@ class WikiHashtagsPlugin extends Plugin
 
     function onStartShowSections($action)
     {
-        common_debug('WikiHashtags: got called');
         $name = $action->trimmed('action');
 
         if ($name == 'tag') {
-            common_debug('WikiHashtags: called by tag');
 
             $taginput = $action->trimmed('tag');
             $tag = common_canonical_tag($taginput);
 
             if (!empty($tag)) {
-                common_debug('WikiHashtags: have a tag: ' . $tag);
 
                 $url = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=render',
                                urlencode($tag));
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
                                    urlencode($tag));
 
-                common_debug('WikiHashtags: have an url: ' . $url);
-
                 $context = stream_context_create(array('http' => array('method' => "GET",
                                                                        'header' =>
                                                                        "User-Agent: " . $this->userAgent())));
                 $html = @file_get_contents($url, false, $context);
 
-                common_debug('WikiHashtags: results are: ' . $html);
-
                 $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section'));
 
-                $action->element('h2', null, _('WikiHashtags'));
-
                 if (!empty($html)) {
-                    $action->element('style', null, 'span.editsection { display: none }');
+                    $action->element('style', null,
+                                     "span.editsection { display: none }\n".
+                                     "table.toc { display: none }");
                     $action->raw($html);
-                    $action->element('a', array('href' => $editurl),
+                    $action->elementStart('p');
+                    $action->element('a', array('href' => $editurl,
+                                                'title' => sprintf(_('Edit the article for #%s on WikiHashtags'), $tag)),
                                      _('Edit'));
+                    $action->element('a', array('href' => 'http://www.gnu.org/copyleft/fdl.html',
+                                                'title' => _('Shared under the terms of the GNU Free Documentation License'),
+                                                'rel' => 'license'),
+                                     'GNU FDL');
+                    $action->elementEnd('p');
                 } else {
                     $action->element('a', array('href' => $editurl),
                                      sprintf(_('Start the article for #%s on WikiHashtags'), $tag));