aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--index.php8
-rw-r--r--plugins/wallabag/wallabag.meta2
2 files changed, 7 insertions, 3 deletions
diff --git a/index.php b/index.php
index a5d8b7bd..d88f4346 100644
--- a/index.php
+++ b/index.php
@@ -53,6 +53,9 @@ $GLOBALS['config']['LOG_FILE'] = $GLOBALS['config']['DATADIR'].'/log.txt';
53// For updates check of Shaarli 53// For updates check of Shaarli
54$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt'; 54$GLOBALS['config']['UPDATECHECK_FILENAME'] = $GLOBALS['config']['DATADIR'].'/lastupdatecheck.txt';
55 55
56// Set ENABLE_UPDATECHECK to disabled by default.
57$GLOBALS['config']['ENABLE_UPDATECHECK'] = false;
58
56// RainTPL cache directory (keep the trailing slash!) 59// RainTPL cache directory (keep the trailing slash!)
57$GLOBALS['config']['RAINTPL_TMP'] = 'tmp/'; 60$GLOBALS['config']['RAINTPL_TMP'] = 'tmp/';
58// Raintpl template directory (keep the trailing slash!) 61// Raintpl template directory (keep the trailing slash!)
@@ -113,7 +116,8 @@ $GLOBALS['config']['UPDATECHECK_INTERVAL'] = 86400;
113//); 116//);
114$GLOBALS['config']['ENABLED_PLUGINS'] = array('qrcode'); 117$GLOBALS['config']['ENABLED_PLUGINS'] = array('qrcode');
115 118
116//$GLOBALS['plugins']['WALLABAG_URL'] = 'https://demo.wallabag.org/'; 119// Initialize plugin parameters array.
120$GLOBALS['plugins'] = array();
117 121
118// PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable. 122// PubSubHubbub support. Put an empty string to disable, or put your hub url here to enable.
119$GLOBALS['config']['PUBSUBHUB_URL'] = ''; 123$GLOBALS['config']['PUBSUBHUB_URL'] = '';
@@ -1141,9 +1145,9 @@ function renderPage()
1141 // Call plugin hooks for header, footer and includes, specifying which page will be rendered. 1145 // Call plugin hooks for header, footer and includes, specifying which page will be rendered.
1142 // Then assign generated data to RainTPL. 1146 // Then assign generated data to RainTPL.
1143 $common_hooks = array( 1147 $common_hooks = array(
1148 'includes',
1144 'header', 1149 'header',
1145 'footer', 1150 'footer',
1146 'includes',
1147 ); 1151 );
1148 $pluginManager = PluginManager::getInstance(); 1152 $pluginManager = PluginManager::getInstance();
1149 foreach($common_hooks as $name) { 1153 foreach($common_hooks as $name) {
diff --git a/plugins/wallabag/wallabag.meta b/plugins/wallabag/wallabag.meta
index 8763c4a2..26e1ea63 100644
--- a/plugins/wallabag/wallabag.meta
+++ b/plugins/wallabag/wallabag.meta
@@ -1,2 +1,2 @@
1description="For each link, add a Wallabag icon to save it in your instance." 1description="For each link, add a Wallabag icon to save it in your instance."
2parameters="WALLABAG_URL" \ No newline at end of file 2parameters="WALLABAG_URL;WALLABAG_VERSION" \ No newline at end of file