Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr

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

diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index a1917295fbb292c205bc4efb9c259d1fc8bbd06f..45526695acc28adf3db3a112d939ca8858223395 100755 (executable)
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -3,7 +3,7 @@
  * poche, a read it later open source system
  *
  * @category   poche
- * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
@@ -12,12 +12,9 @@ require_once __DIR__ . '/../../inc/poche/define.inc.php';
 
 # /!\ Be careful if you change the lines below /!\
 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>');
+    die('Twig does not seem installed. Have a look at <a href="inthepoche.com/doc">the documentation.</a>');
 }
 
-// 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';
@@ -40,6 +37,7 @@ 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';
+require_once __DIR__ . '/../../inc/3rdparty/FlattrItem.class.php';
 
 if (DOWNLOAD_PICTURES) {
     require_once __DIR__ . '/../../inc/poche/pochePictures.php';