aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorArthur <arthur@hoa.ro>2016-12-20 11:44:19 +0100
committerGitHub <noreply@github.com>2016-12-20 11:44:19 +0100
commite0177549c760b143efdd17b1579e0c0199dce939 (patch)
treeebe39650f12a80c09f8fae1b87a9d5c4c4141466 /index.php
parent80677a23e2e10d78bc527e9754286787b453ce61 (diff)
parentdb90dfcbbc406b50381f17a72f24095fee91bb09 (diff)
downloadShaarli-e0177549c760b143efdd17b1579e0c0199dce939.tar.gz
Shaarli-e0177549c760b143efdd17b1579e0c0199dce939.tar.zst
Shaarli-e0177549c760b143efdd17b1579e0c0199dce939.zip
Merge pull request #620 from ArthurHoaro/pubsubhub
Move Pubsubhub to a default plugin
Diffstat (limited to 'index.php')
-rw-r--r--index.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/index.php b/index.php
index eb73941d..dd9b48bd 100644
--- a/index.php
+++ b/index.php
@@ -910,10 +910,6 @@ function renderPage($conf, $pluginManager, $LINKSDB)
910 $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0))); 910 $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0)));
911 $feedGenerator->setHideDates($conf->get('privacy.hide_timestamps') && !isLoggedIn()); 911 $feedGenerator->setHideDates($conf->get('privacy.hide_timestamps') && !isLoggedIn());
912 $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$conf->get('feed.rss_permalinks')); 912 $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$conf->get('feed.rss_permalinks'));
913 $pshUrl = $conf->get('config.PUBSUBHUB_URL');
914 if (!empty($pshUrl)) {
915 $feedGenerator->setPubsubhubUrl($pshUrl);
916 }
917 $data = $feedGenerator->buildData(); 913 $data = $feedGenerator->buildData();
918 914
919 // Process plugin hook. 915 // Process plugin hook.
@@ -1289,7 +1285,6 @@ function renderPage($conf, $pluginManager, $LINKSDB)
1289 1285
1290 $LINKSDB[$id] = $link; 1286 $LINKSDB[$id] = $link;
1291 $LINKSDB->save($conf->get('resource.page_cache')); 1287 $LINKSDB->save($conf->get('resource.page_cache'));
1292 pubsubhub($conf);
1293 1288
1294 // If we are called from the bookmarklet, we must close the popup: 1289 // If we are called from the bookmarklet, we must close the popup:
1295 if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) { 1290 if (isset($_GET['source']) && ($_GET['source']=='bookmarklet' || $_GET['source']=='firefoxsocialapi')) {