--- rat/lonpageflip.pm	2003/09/09 18:46:28	1.41
+++ rat/lonpageflip.pm	2003/10/29 22:09:17	1.46
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.41 2003/09/09 18:46:28 www Exp $
+# $Id: lonpageflip.pm,v 1.46 2003/10/29 22:09:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -190,6 +190,7 @@ sub handler {
       $ENV{'form.postdata'}=~/(\w+)\:(.*)/;
       my $direction=$1;
       my $currenturl=$2;
+      $currenturl=~s/\.\d+\.(\w+)$/\.$1/;
       if ($direction eq 'return') {
 # -------------------------------------------------------- Return to last known
          my $last;
@@ -388,7 +389,10 @@ ENDNONE
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-         $r->internal_redirect('/adm/ambiguous');
+	  if ( &Apache::lonnet::mod_perl_version() == 2 ) {
+	      &Apache::lonnet::cleanenv();
+	  }
+	  $r->internal_redirect('/adm/ambiguous');
       }
   } else {
 # -------------------------- Class was not initialized or page fliped strangely