aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/3rdparty
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-20 12:49:49 +0100
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-20 12:49:49 +0100
commitab5bb94b12e04b357f8faee376704bc29ff019a5 (patch)
treee055f9cf96738f7b8a26caed4893951022527eed /inc/3rdparty
parentd09a5674e915e79762931a3465461327fb5737ea (diff)
parente83cf5a7875d1387d79d1909050ff2eca9b4421a (diff)
downloadwallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.gz
wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.zst
wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.zip
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
Diffstat (limited to 'inc/3rdparty')
-rwxr-xr-x[-rw-r--r--]inc/3rdparty/config.php2
-rwxr-xr-x[-rw-r--r--]inc/3rdparty/makefulltextfeed.php1
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 @@
11// options you'd like to override in custom_config.php. 11// options you'd like to override in custom_config.php.
12// ..................................................... 12// .....................................................
13 13
14global $options;
15
14// Create config object 16// Create config object
15if (!isset($options)) $options = new stdClass(); 17if (!isset($options)) $options = new stdClass();
16 18
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;
424////////////////////////////////// 424//////////////////////////////////
425// Set up Content Extractor 425// Set up Content Extractor
426////////////////////////////////// 426//////////////////////////////////
427global $extractor;
427$extractor = new ContentExtractor(dirname(__FILE__).'/site_config/custom', dirname(__FILE__).'/site_config/standard'); 428$extractor = new ContentExtractor(dirname(__FILE__).'/site_config/custom', dirname(__FILE__).'/site_config/standard');
428$extractor->debug = $debug_mode; 429$extractor->debug = $debug_mode;
429SiteConfig::$debug = $debug_mode; 430SiteConfig::$debug = $debug_mode;