X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=6d712aee08e61601b961dc5e8125b42e544777fe;hb=628b97cbdf276785eb9ff4f7a124e81e67d2f76c;hp=5bc13d49fd812f88d662c1d21bc53e3ae02c2a10;hpb=03542572665bae57705a2f57b0737ed43f4f1415;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index 5bc13d49..6d712aee 100644 --- a/index.php +++ b/index.php @@ -606,8 +606,6 @@ function showDailyRSS($conf) { $absurl = escape(index_url($_SERVER).'?do=daily&day='.$day); // Absolute URL of the corresponding "Daily" page. // Build the HTML body of this RSS entry. - $html = ''; - $href = ''; $links = array(); // We pre-format some fields for proper output. @@ -778,6 +776,7 @@ function renderPage($conf, $pluginManager) $PAGE = new PageBuilder($conf); $PAGE->assign('linkcount', count($LINKSDB)); $PAGE->assign('privateLinkcount', count_private($LINKSDB)); + $PAGE->assign('plugin_errors', $pluginManager->getErrors()); // Determine which page will be rendered. $query = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : ''; @@ -832,7 +831,7 @@ function renderPage($conf, $pluginManager) // Get only links which have a thumbnail. foreach($links as $link) { - $permalink='?'.escape(smallhash($link['linkdate'])); + $permalink='?'.escape(smallHash($link['linkdate'])); $thumb=lazyThumbnail($conf, $link['url'],$permalink); if ($thumb!='') // Only output links which have a thumbnail. { @@ -866,7 +865,7 @@ function renderPage($conf, $pluginManager) $maxcount = max($maxcount, $value); } - // Sort tags alphabetically: case insensitive, support locale if avalaible. + // Sort tags alphabetically: case insensitive, support locale if available. uksort($tags, function($a, $b) { // Collator is part of PHP intl. if (class_exists('Collator')) { @@ -1669,8 +1668,6 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) $next_page_url = '?page=' . ($page-1) . $searchtermUrl . $searchtagsUrl; } - $token = isLoggedIn() ? getToken($conf) : ''; - // Fill all template fields. $data = array( 'previous_page_url' => $previous_page_url,