From 483d2551eaea6ffc3f7e13c8ea9c3ea215fadff0 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 8 Oct 2014 15:24:19 +0200 Subject: get rid of simplepie absolute url function and use Net url2 --- appinfo/application.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'appinfo') diff --git a/appinfo/application.php b/appinfo/application.php index 6028d7c1c..ad15dac84 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -54,16 +54,20 @@ use \OCA\News\ArticleEnhancer\XPathArticleEnhancer; use \OCA\News\ArticleEnhancer\RegexArticleEnhancer; -require_once __DIR__ . '/../3rdparty/htmlpurifier/library/HTMLPurifier.auto.php'; +$thirdPartyLibs = [ + '\HTMLPurifier' => 'htmlpurifier/library/HTMLPurifier.auto.php', + '\SimplePie' => 'simplepie/autoloader.php', + '\ZendXML\Security' => 'ZendXml/vendor/autoload.php', + '\Net_URL2' => 'Net_URL2/Net/URL2.php' +]; // to prevent clashes with installed app framework versions -if (!class_exists('\SimplePie')) { - require_once __DIR__ . '/../3rdparty/simplepie/autoloader.php'; +foreach ($thirdPartyLibs as $class => $path) { + if (!class_exists($class)) { + require_once __DIR__ . '/../3rdparty/' . $path; + } } -if (!class_exists('\ZendXML\Security')) { - require_once __DIR__ . '/../3rdparty/ZendXml/vendor/autoload.php'; -} class Application extends App { -- cgit v1.2.3