From 10f40661a2f517393331b554c2fec295c8c160e8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 30 Nov 2009 08:09:30 -0800 Subject: Ticket 1870: drop unnecessary Tidy module installation requirement. Tidy was only being used by a couple of non-default URL shortener plugins, PtitUrl and TightUrl. Both were easily changed to load the tag-soup HTML via DOMDocument (using the default DOM module which is already used by other dependencies). Added xml, dom, and simplexml modules to the requirements check in install.php, as they were being used but not checked for. Also cleaned up LilUrl, PtitUrl, and TightUrl to return URL as a string instead of as a SimpleXML node object. --- plugins/PtitUrl/PtitUrlPlugin.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'plugins/PtitUrl') diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index ef453e96d..76a438dd5 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -47,11 +47,14 @@ class PtitUrlPlugin extends UrlShortenerPlugin { $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url))); if (!$response) return; - $response = $this->tidy($response); - $y = @simplexml_load_string($response); + $dom = new DOMDocument(); + @$dom->loadHTML($response); + $y = @simplexml_import_dom($dom); if (!isset($y->body)) return; $xml = $y->body->center->table->tr->td->pre->a->attributes(); - if (isset($xml['href'])) return $xml['href']; + if (isset($xml['href'])) { + return strval($xml['href']); + } } } -- cgit v1.2.3-54-g00ecf