let tpl_pageinfo optionally return instead of printing FS#1407

darcs-hash:20080608111736-7ad00-7dd90b1bef3e6ebfd30dba723978e07e717d353c.gz

1 files changed, 24 insertions, 18 deletions

diff --git a/inc/template.php b/inc/template.php
index 6d057463f..4ef3c0fab 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -824,7 +824,7 @@ function tpl_youarehere($sep=' » '){
     $part .= $parts[$i].':';
     $page = $part;
     resolve_pageid('',$page,$exists);
-    if ($page == $conf['start']) continue; // Skip startpage 
+    if ($page == $conf['start']) continue; // Skip startpage
 
     // output
     echo $sep;
@@ -875,16 +875,16 @@ function tpl_userinfo(){
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function tpl_pageinfo(){
+function tpl_pageinfo($ret=false){
   global $conf;
   global $lang;
   global $INFO;
   global $REV;
   global $ID;
-  
+
   // return if we are not allowed to view the page
-  if (!auth_quickaclcheck($ID)) { return; }
-  
+  if (!auth_quickaclcheck($ID)) { return false; }
+
   // prepare date and path
   $fn = $INFO['filepath'];
   if(!$conf['fullpath']){
@@ -899,24 +899,30 @@ function tpl_pageinfo(){
 
   // print it
   if($INFO['exists']){
-    print $fn;
-    print ' &middot; ';
-    print $lang['lastmod'];
-    print ': ';
-    print $date;
+    $out = '';
+    $out .= $fn;
+    $out .= ' &middot; ';
+    $out .= $lang['lastmod'];
+    $out .= ': ';
+    $out .= $date;
     if($INFO['editor']){
-      print ' '.$lang['by'].' ';
-      print $INFO['editor'];
+      $out .= ' '.$lang['by'].' ';
+      $out .= $INFO['editor'];
     }else{
-      print ' ('.$lang['external_edit'].')';
+      $out .= ' ('.$lang['external_edit'].')';
     }
     if($INFO['locked']){
-      print ' &middot; ';
-      print $lang['lockedby'];
-      print ': ';
-      print $INFO['locked'];
+      $out .= ' &middot; ';
+      $out .= $lang['lockedby'];
+      $out .= ': ';
+      $out .= $INFO['locked'];
+    }
+    if($ret){
+        return $out;
+    }else{
+        echo $out;
+        return true;
     }
-    return true;
   }
   return false;
 }