From 6d365e8083ecf67212203fe86fd1e1bf2b4ac281 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 9 Apr 2014 01:47:12 +0200 Subject: include simplepie lib --- dependencyinjection/dicontainer.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dependencyinjection') diff --git a/dependencyinjection/dicontainer.php b/dependencyinjection/dicontainer.php index 377b0f376..ef8ffd0f6 100644 --- a/dependencyinjection/dicontainer.php +++ b/dependencyinjection/dicontainer.php @@ -72,8 +72,10 @@ use \OCA\News\Middleware\CORSMiddleware; require_once __DIR__ . '/../3rdparty/htmlpurifier/library/HTMLPurifier.auto.php'; -// uncomment once appframework not required anymore -//require_once __DIR__ . '/../3rdparty/simplepie/autoloader.php'; +// to prevent clashes with installed app framework versions +if(!class_exists('\SimplePie')) { + require_once __DIR__ . '/../3rdparty/simplepie/autoloader.php'; +} class DIContainer extends BaseContainer { -- cgit v1.2.3