Merge pull request #181 from inthepoche/dev

[github/wallabag/wallabag.git] / inc / poche / config.inc.php

diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 4122ff102d0d5ab6ee780468d642080fa55053fb..a1917295fbb292c205bc4efb9c259d1fc8bbd06f 100755 (executable)
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
     die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
 }
 
-if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
-    require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
-}
+// if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
+    // require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
+// }
 require_once __DIR__ . '/../../inc/poche/User.class.php';
 require_once __DIR__ . '/../../inc/poche/Url.class.php';
 require_once __DIR__ . '/../../inc/3rdparty/class.messages.php';
@@ -30,10 +30,25 @@ require_once __DIR__ . '/../../inc/3rdparty/simple_html_dom.php';
 require_once __DIR__ . '/../../inc/3rdparty/paginator.php';
 require_once __DIR__ . '/../../inc/3rdparty/Session.class.php';
 
+require_once __DIR__ . '/../../inc/3rdparty/simplepie/SimplePieAutoloader.php';
+require_once __DIR__ . '/../../inc/3rdparty/simplepie/SimplePie/Core.php';
+require_once __DIR__ . '/../../inc/3rdparty/content-extractor/ContentExtractor.php';
+require_once __DIR__ . '/../../inc/3rdparty/content-extractor/SiteConfig.php';
+require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/HumbleHttpAgent.php';
+require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/SimplePie_HumbleHttpAgent.php';
+require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/CookieJar.php';
+require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedItem.php';
+require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedWriter.php';
+require_once __DIR__ . '/../../inc/3rdparty/feedwriter/DummySingleItemFeed.php';
+
 if (DOWNLOAD_PICTURES) {
     require_once __DIR__ . '/../../inc/poche/pochePictures.php';
 }
 
+if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
+    date_default_timezone_set('UTC');
+}
+
 $poche = new Poche();
 #XSRF protection with token
 // if (!empty($_POST)) {