@fivefilters via composer

2 files changed, 3 insertions, 7 deletions

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 7ccfc069..d625fc40 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -345,7 +345,7 @@ final class Tools
         // Silence $scope function to avoid
         // issues with FTRSS when error_reporting is to high
         // FTRSS generates PHP warnings which break output
-        $json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
+        $json = @$scope("vendor/wallabag/Fivefilters_Libraries/makefulltextfeed.php", array("url" => $url));
 
         // Clearing and restoring context
         foreach ($GLOBALS as $key => $value) {
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 95bf8ef1..ff7ebf64 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -14,22 +14,18 @@ define('INCLUDES', dirname(__FILE__) . '/..');
 # the poche root directory
 define('ROOT', INCLUDES . '/..');
 
+require_once ROOT . '/vendor/autoload.php';
 require_once INCLUDES . '/poche/Tools.class.php';
 require_once INCLUDES . '/poche/User.class.php';
 require_once INCLUDES . '/poche/Url.class.php';
-require_once ROOT . '/vendor/autoload.php';
 require_once INCLUDES . '/poche/Template.class.php';
 require_once INCLUDES . '/poche/Language.class.php';
 require_once INCLUDES . '/poche/Routing.class.php';
 require_once INCLUDES . '/poche/WallabagEBooks.class.php';
 require_once INCLUDES . '/poche/Poche.class.php';
-
 require_once INCLUDES . '/poche/Database.class.php';
 require_once INCLUDES . '/poche/FlattrItem.class.php';
 
-require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
-require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
-
 # system configuration; database credentials et caetera
 require_once INCLUDES . '/poche/config.inc.php';
 require_once INCLUDES . '/poche/config.inc.default.php';
@@ -44,4 +40,4 @@ if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timez
 
 if (defined('ERROR_REPORTING')) {
     error_reporting(ERROR_REPORTING);
-}
+}
\ No newline at end of file