pagetitle as template pagename

Uses the first heading as the page name in the default template
if $conf['useheading'] is set. Updates tpl_pagetitle() so that it
can return this value.

darcs-hash:20060410234311-05dcb-b4636f7c0d8f98658a6097ea9ee4dff1ee2de8b4.gz

2 files changed, 10 insertions, 5 deletions

diff --git a/inc/template.php b/inc/template.php
index c1848dd79..64c87d583 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -815,14 +815,14 @@ function tpl_mediauploadform(){
 }
 
 /**
- * Prints the name of the given page (current one if none given).
+ * Prints or returns the name of the given page (current one if none given).
  *
  * If useheading is enabled this will use the first headline else
- * the given ID is printed.
+ * the given ID is used.
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_pagetitle($id=null){
+function tpl_pagetitle($id=null, $ret=false){
   global $conf;
   if(is_null($id)){
     global $ID;
@@ -834,7 +834,12 @@ function tpl_pagetitle($id=null){
     $title = p_get_first_heading($id);
     if ($title) $name = $title;
   }
-  print hsc($name);
+
+  if ($ret) {
+      return hsc($name);
+  } else {
+      print hsc($name);
+  }
 }
 
 /**
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 25f0cb3ff..a63831ae4 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -36,7 +36,7 @@
 
     <div class="header">
       <div class="pagename">
-        [[<?php tpl_link(wl($ID,'do=backlink'),$ID)?>]]
+        [[<?php tpl_link(wl($ID,'do=backlink'),tpl_pagetitle($ID,true))?>]]
       </div>
       <div class="logo">
         <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[ALT+H]"')?>