diff options
author | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
commit | d9cde0ef80ee838a99035d44f0286b3cc902e332 (patch) | |
tree | ac9d74d52a06890db71f61ac934e75b937c19753 /plugins/WikiHashtagsPlugin.php | |
parent | f2b642ce822c480cfc418c38106cc18c3a428cf4 (diff) | |
parent | 2d8ad0409d8e78ec35a65156bc375eacbe561963 (diff) |
Merge branch '0.9.x' into userflag
Diffstat (limited to 'plugins/WikiHashtagsPlugin.php')
-rw-r--r-- | plugins/WikiHashtagsPlugin.php | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php index 0c5649aa4..334fc13ba 100644 --- a/plugins/WikiHashtagsPlugin.php +++ b/plugins/WikiHashtagsPlugin.php @@ -68,14 +68,13 @@ class WikiHashtagsPlugin extends Plugin $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit', urlencode($tag)); - $context = stream_context_create(array('http' => array('method' => "GET", - 'header' => - "User-Agent: " . $this->userAgent()))); - $html = @file_get_contents($url, false, $context); + $request = HTTPClient::start(); + $response = $request->get($url); + $html = $response->getBody(); $action->elementStart('div', array('id' => 'wikihashtags', 'class' => 'section')); - if (!empty($html)) { + if ($response->isOk() && !empty($html)) { $action->element('style', null, "span.editsection { display: none }\n". "table.toc { display: none }"); @@ -100,10 +99,4 @@ class WikiHashtagsPlugin extends Plugin return true; } - - function userAgent() - { - return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION . - ' StatusNet/' . STATUSNET_VERSION; - } } |