X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2Fglobal.inc.php;h=ff7ebf6476de20cb42a401bf1d5c5166fefe3889;hb=c78c1a3f08815aab99752026ccdf1dcf63cf43c1;hp=e2beade1f2c3904c35daef0fba3f18d5c3a53055;hpb=c95b78a8ceb918f033f3dd6c26aa7da4a8a527dc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
old mode 100644
new mode 100755
index e2beade1..ff7ebf64
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -5,7 +5,7 @@
  * @category   wallabag
  * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
- * @license    http://www.wtfpl.net/ see COPYING file
+ * @license    http://opensource.org/licenses/MIT see COPYING file
  */
 
 # the poche system root directory (/inc)
@@ -14,39 +14,30 @@ 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 INCLUDES . '/3rdparty/class.messages.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 . '/3rdparty/simple_html_dom.php';
-require_once INCLUDES . '/3rdparty/paginator.php';
-require_once INCLUDES . '/3rdparty/Session.class.php';
-
-require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
-require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
-require_once INCLUDES . '/3rdparty/FlattrItem.class.php';
+require_once INCLUDES . '/poche/FlattrItem.class.php';
 
-# Composer its autoloader for automatically loading Twig
-if (! file_exists(ROOT . '/vendor/autoload.php')) {
-    Poche::$canRenderTemplates = false;
-} else {
-    require_once ROOT . '/vendor/autoload.php';
-}
+# system configuration; database credentials et caetera
+require_once INCLUDES . '/poche/config.inc.php';
+require_once INCLUDES . '/poche/config.inc.default.php';
 
-# system configuration; database credentials et cetera
-if (! file_exists(INCLUDES . '/poche/config.inc.php')) {
-    Poche::$configFileAvailable = false;
-} else {
-    require_once INCLUDES . '/poche/config.inc.php';
-}
-
-if (Poche::$configFileAvailable && DOWNLOAD_PICTURES) {
+if (DOWNLOAD_PICTURES) {
     require_once  INCLUDES . '/poche/pochePictures.php';
 }
 
 if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timezone'))) {
     date_default_timezone_set('UTC');
+}
+
+if (defined('ERROR_REPORTING')) {
+    error_reporting(ERROR_REPORTING);
 }
\ No newline at end of file