Merge branch 'master' of github.com:splitbrain/dokuwiki

1 files changed, 5 insertions, 19 deletions

diff --git a/inc/template.php b/inc/template.php
index 53ae9abce..e4c74a714 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -748,39 +748,27 @@ function tpl_youarehere($sep=' » '){
     echo '<span class="bchead">'.$lang['youarehere'].': </span>';
 
     // always print the startpage
-    $title = useHeading('navigation') ? p_get_first_heading($conf['start']) : $conf['start'];
-    if(!$title) $title = $conf['start'];
-    tpl_link(wl($conf['start']),hsc($title),'title="'.$conf['start'].'"');
+    tpl_pagelink(':'.$conf['start']);
 
     // print intermediate namespace links
     $part = '';
     for($i=0; $i<$count - 1; $i++){
         $part .= $parts[$i].':';
         $page = $part;
-        resolve_pageid('',$page,$exists);
         if ($page == $conf['start']) continue; // Skip startpage
 
         // output
         echo $sep;
-        if($exists){
-            $title = useHeading('navigation') ? p_get_first_heading($page) : $parts[$i];
-            tpl_link(wl($page),hsc($title),'title="'.$page.'"');
-        }else{
-            tpl_link(wl($page),$parts[$i],'title="'.$page.'" class="wikilink2" rel="nofollow"');
-        }
+        tpl_pagelink($page);
     }
 
     // print current page, skipping start page, skipping for namespace index
+    resolve_pageid('',$page,$exists);
     if(isset($page) && $page==$part.$parts[$i]) return;
     $page = $part.$parts[$i];
     if($page == $conf['start']) return;
     echo $sep;
-    if(page_exists($page)){
-        $title = useHeading('navigation') ? p_get_first_heading($page) : $parts[$i];
-        tpl_link(wl($page),hsc($title),'title="'.$page.'"');
-    }else{
-        tpl_link(wl($page),$parts[$i],'title="'.$page.'" class="wikilink2" rel="nofollow"');
-    }
+    tpl_pagelink($page);
     return true;
 }
 
@@ -1000,8 +988,6 @@ function tpl_indexerWebBug(){
     global $INFO;
     if(!$INFO['exists']) return false;
 
-    if(isHiddenPage($ID)) return false; //no need to index hidden pages
-
     $p = array();
     $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).
         '&'.time();
@@ -1248,7 +1234,7 @@ function tpl_license($img='badge',$imgonly=false,$return=false){
     }
     if(!$imgonly) {
         $out .= $lang['license'];
-        $out .= '<a href="'.$lic['url'].'" rel="license" class="urlextern"';
+        $out .= ' <a href="'.$lic['url'].'" rel="license" class="urlextern"';
         if($conf['target']['extern']) $out .= ' target="'.$conf['target']['extern'].'"';
         $out .= '>'.$lic['name'].'</a>';
     }