Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev

2 files changed, 3 insertions, 0 deletions

diff --git a/inc/3rdparty/config.php b/inc/3rdparty/config.php
index 61fc0d0e..e618117b 100644..100755
--- a/inc/3rdparty/config.php
+++ b/inc/3rdparty/config.php
@@ -11,6 +11,8 @@
 // options you'd like to override in custom_config.php.

 // .....................................................

 

+global $options;

+

 // Create config object

 if (!isset($options)) $options = new stdClass();

 

diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php
index 7104bc73..2852c4c2 100644..100755
--- a/inc/3rdparty/makefulltextfeed.php
+++ b/inc/3rdparty/makefulltextfeed.php
@@ -424,6 +424,7 @@ $http->rewriteUrls = $options->rewrite_url;
 //////////////////////////////////

 // Set up Content Extractor

 //////////////////////////////////

+global $extractor;

 $extractor = new ContentExtractor(dirname(__FILE__).'/site_config/custom', dirname(__FILE__).'/site_config/standard');

 $extractor->debug = $debug_mode;

 SiteConfig::$debug = $debug_mode;