# HG changeset patch
# User Dan
# Date 1201836520 18000
# Node ID 43b908c9b2e262b32e022a10382abf4514592901
# Parent  881b77f880fb7030318e7d189ad4f921d78d751e# Parent  7b984f924dcd6981bc81cfb2f188d1492b05c344
Merging scribus and nighthawk branches

diff -r 881b77f880fb -r 43b908c9b2e2 includes/paths.php
--- a/includes/paths.php	Thu Jan 31 22:28:12 2008 -0500
+++ b/includes/paths.php	Thu Jan 31 22:28:40 2008 -0500
@@ -495,11 +495,8 @@
         header('Location: '.$loc);
         exit;
       }
-      if( !( substr($pi[1], 0, strlen($this->nslist['Special'])) == $this->nslist['Special'] ) )
-      {
-        unset($pi[0]);
-        $pi[1] = implode('/', $pi);
-      }
+      unset($pi[0]);
+      $pi[1] = implode('/', $pi);
       $ret = $pi[1];
     }
     else
@@ -521,6 +518,14 @@
       }
     }
     
+    if ( isset($ret) )
+    {
+      if ( substr($ret, 0, ( strlen($this->nslist['Special']) )) == $this->nslist['Special'] && strstr($ret, '/') )
+      {
+        list ( $ret ) = explode('/', $ret);
+      }
+    }
+    
     return ( isset($ret) ) ? $ret : false;
   }
   // Parses a (very carefully formed) array into Javascript code compatible with the Tigra Tree Menu used in the admin menu