fix for breadcrumbs and "namespace:start" pages (FS#927) by Nathan Fr…

…itz <fritzn@crown.edu>

darcs-hash:20070331213401-d5083-2c30028ab1c81465b0295106ce6a52ce18ad87cf.gz

inc/common.php

@@ -236,7 +236,7 @@ function breadcrumbs(){
   }
 
   // page names
-  $name = noNS($ID);
+  $name = noNSorNS($ID);
   if ($conf['useheading']) {
     // get page title
     $title = p_get_first_heading($ID);

inc/pageutils.php

@@ -98,7 +98,7 @@ function cleanID($raw_id,$ascii=false){
   // check if it's already in the memory cache
   if (isset($cache[$raw_id])) {
     return $cache[$raw_id];
-	}
+    }
 
   $sepchar = $conf['sepchar'];
   if($sepcharpat == null) // build string only once to save clock cycles
@@ -160,6 +160,33 @@ function noNS($id) {
   }
 }
 
+/**
+* Returns the current namespace
+*
+* @author Nathan Fritz <fritzn@crown.edu>
+*/
+function curNS($id) {
+    return noNS(getNS($id));
+}
+
+/**
+* Returns the ID without the namespace or current namespace for 'start' pages
+*
+* @author Nathan Fritz <fritzn@crown.edu>
+*/
+function noNSorNS($id) {
+    global $conf;
+
+    $p = noNS($id);
+    if ($p == $conf['start']) {
+        $p = curNS($id);
+        if ($p == false) {
+            return noNS($id);
+        }
+    }
+    return $p;
+}
+
 /**
  * returns the full path to the datafile specified by ID and
  * optional revision