aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-05-07 18:39:25 +0200
committerGitHub <noreply@github.com>2017-05-07 18:39:25 +0200
commita9fe41a818c0a687e0a63795b55decc321a1f57a (patch)
tree2fc4a60bf43af7d4a9a53eef5a1f55377ac4cbd4 /index.php
parent3108f2a8008280f857f56db50d6f0145d680b142 (diff)
parent73c896265424873a4e8e5dc70f99413e56dfcce9 (diff)
downloadShaarli-a9fe41a818c0a687e0a63795b55decc321a1f57a.tar.gz
Shaarli-a9fe41a818c0a687e0a63795b55decc321a1f57a.tar.zst
Shaarli-a9fe41a818c0a687e0a63795b55decc321a1f57a.zip
Merge pull request #862 from ArthurHoaro/theme/tags-everywhere
Inject tag list everywhere to make autocomplete work on the fixed search bar
Diffstat (limited to 'index.php')
-rw-r--r--index.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/index.php b/index.php
index ba1c2b2b..ab1e30da 100644
--- a/index.php
+++ b/index.php
@@ -728,7 +728,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
728 die($e->getMessage()); 728 die($e->getMessage());
729 } 729 }
730 730
731 $PAGE = new PageBuilder($conf); 731 $PAGE = new PageBuilder($conf, $LINKSDB);
732 $PAGE->assign('linkcount', count($LINKSDB)); 732 $PAGE->assign('linkcount', count($LINKSDB));
733 $PAGE->assign('privateLinkcount', count_private($LINKSDB)); 733 $PAGE->assign('privateLinkcount', count_private($LINKSDB));
734 $PAGE->assign('plugin_errors', $pluginManager->getErrors()); 734 $PAGE->assign('plugin_errors', $pluginManager->getErrors());
@@ -1170,7 +1170,6 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1170 if ($targetPage == Router::$PAGE_CHANGETAG) 1170 if ($targetPage == Router::$PAGE_CHANGETAG)
1171 { 1171 {
1172 if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) { 1172 if (empty($_POST['fromtag']) || (empty($_POST['totag']) && isset($_POST['renametag']))) {
1173 $PAGE->assign('tags', $LINKSDB->allTags());
1174 $PAGE->renderPage('changetag'); 1173 $PAGE->renderPage('changetag');
1175 exit; 1174 exit;
1176 } 1175 }
@@ -1700,7 +1699,6 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
1700 'visibility' => ! empty($_SESSION['privateonly']) ? 'private' : '', 1699 'visibility' => ! empty($_SESSION['privateonly']) ? 'private' : '',
1701 'redirector' => $conf->get('redirector.url'), // Optional redirector URL. 1700 'redirector' => $conf->get('redirector.url'), // Optional redirector URL.
1702 'links' => $linkDisp, 1701 'links' => $linkDisp,
1703 'tags' => $LINKSDB->allTags(),
1704 ); 1702 );
1705 1703
1706 // If there is only a single link, we change on-the-fly the title of the page. 1704 // If there is only a single link, we change on-the-fly the title of the page.