X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=55b12adc9384859c472b4135292ff12beec50415;hb=refs%2Fpull%2F621%2Fhead;hp=00012e2252f9ddd6461590ef2ab05251f35a935f;hpb=b6e58bab8a77f097e1e7de32edc992298f164897;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index 00012e22..55b12adc 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /** * Shaarli v0.7.0 - Shaare your links... * - * The personal, minimalist, super-fast, no-database Delicious clone. + * The personal, minimalist, super-fast, database free, bookmarking service. * * Friendly fork by the Shaarli community: * - https://github.com/shaarli/Shaarli @@ -1676,10 +1676,7 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) $keys[] = $key; } - // If there is only a single link, we change on-the-fly the title of the page. - if (count($linksToDisplay) == 1) { - $conf->set('pagetitle', $linksToDisplay[$keys[0]]['title'] .' - '. $conf->get('general.title')); - } + // Select articles according to paging. $pagecount = ceil(count($keys) / $_SESSION['LINKS_PER_PAGE']); @@ -1741,9 +1738,10 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager) 'links' => $linkDisp, 'tags' => $LINKSDB->allTags(), ); - // FIXME! temporary fix - see #399. - if ($conf->exists('pagetitle') && count($linkDisp) == 1) { - $data['pagetitle'] = $conf->get('pagetitle'); + + // If there is only a single link, we change on-the-fly the title of the page. + if (count($linksToDisplay) == 1) { + $data['pagetitle'] = $linksToDisplay[$keys[0]]['title'] .' - '. $conf->get('general.title'); } $pluginManager->executeHooks('render_linklist', $data, array('loggedin' => isLoggedIn()));