[Phplib-commit] CVS: php-lib/php/html menu.inc,1.3,1.4

[Richard A. <ric...@us...>]

Update of /cvsroot/phplib/php-lib/php/html
In directory usw-pr-cvs1:/tmp/cvs-serv29455

Modified Files:
	menu.inc 
Log Message:
Sync with -stable

Index: menu.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib/php/html/menu.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** menu.inc	20 Aug 2001 06:38:10 -0000	1.3
--- menu.inc	26 Apr 2002 12:30:05 -0000	1.4
***************
*** 54,61 ****
     */
    function get() {
!     global $PHP_SELF;
      
      # Determine normalized current position in tree
!     $this->map = $this->normalize_pos($PHP_SELF);
  
      # Determine menu levels up from current position
--- 54,61 ----
     */
    function get() {
!     global $HTTP_SERVER_VARS;
      
      # Determine normalized current position in tree
!     $this->map = $this->normalize_pos($HTTP_SERVER_VARS["PHP_SELF"]);
  
      # Determine menu levels up from current position
***************
*** 169,177 ****
     */
    function get_title() {
!     global $PHP_SELF;
      $this->title = "";
      
      # Determine normalized current position in tree
!     $this->map = $this->normalize_pos($PHP_SELF);
  
      # Determine menu levels up from current position
--- 169,177 ----
     */
    function get_title() {
!     global $HTTP_SERVER_VARS;
      $this->title = "";
      
      # Determine normalized current position in tree
!     $this->map = $this->normalize_pos($HTTP_SERVER_VARS["PHP_SELF"]);
  
      # Determine menu levels up from current position
***************
*** 295,298 ****
--- 295,299 ----
      while(list($k, $v) = each($this->urlmap)) {
        $base = dirname($v);
+       $base = str_replace("\\","/",$base);
        if ($base == "/") {
          $base = "";