Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…itz <fritzn@crown.edu>

darcs-hash:20070331213401-d5083-2c30028ab1c81465b0295106ce6a52ce18ad87cf.gz
  • Loading branch information...
commit 1a84a0f3f56866c0f2d06bda411a8020e7e823e5 1 parent 671a58a
Anika Henke authored
Showing with 29 additions and 2 deletions.
  1. +1 −1  inc/common.php
  2. +28 −1 inc/pageutils.php
2  inc/common.php
View
@@ -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);
29 inc/pageutils.php
View
@@ -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
@@ -161,6 +161,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
*
Please sign in to comment.
Something went wrong with that request. Please try again.