diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-09 01:47:12 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-09 22:52:27 +0200 |
| commit | 6d365e8083ecf67212203fe86fd1e1bf2b4ac281 (patch) | |
| tree | be764e2d9b999235071bb909787f26cfb5ee93db /dependencyinjection | |
| parent | 21bd539847f33c3889c4f58f14afd672f54a410a (diff) | |
include simplepie lib
Diffstat (limited to 'dependencyinjection')
| -rw-r--r-- | dependencyinjection/dicontainer.php | 6 |
1 files changed, 4 insertions, 2 deletions
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 { |