Merged from stable

diff --git a/lib/ipatlas/ip-atlas_prefs.php b/lib/ipatlas/ip-atlas_prefs.php
index 8bdc5bc47613fc30121523c9e6157196be0dc8ca..139f5cbce69428e3ab4f25b2c36a8f0199de1c17 100644 (file)
--- a/lib/ipatlas/ip-atlas_prefs.php
+++ b/lib/ipatlas/ip-atlas_prefs.php
@@ -83,7 +83,7 @@ print t("Your settings have been saved. You can now try"); ?> <a href="plot.php<
 
 ?>
 
-<form action="<?php  echo $HTTP_SERVER_VARS['PHP_SELF']; ?><?php  if(isset($HTTP_GET_VARS["lastquery"])) { echo "?lastquery=$HTTP_GET_VARS[lastquery]"; } ?>" method="POST">
+<form action="ip-atlas_prefs.php<?php  if(isset($HTTP_GET_VARS["lastquery"])) { echo "?lastquery=$HTTP_GET_VARS[lastquery]"; } ?>" method="POST">
 
 <?php  if(istheregd()) {
 echo t("Draw mode (defaults guessed for your browser):"); 

diff --git a/lib/ipatlas/plot.php b/lib/ipatlas/plot.php
index b4b7d5fcedd467dc6ac804aeee8addb24bf8cb9a..dc890275cee07c62468b47c324a324e14e8e7ffd 100644 (file)
--- a/lib/ipatlas/plot.php
+++ b/lib/ipatlas/plot.php
@@ -116,7 +116,7 @@ if(isset($address)) {
 print "$username $values[desc]";
 }
 
-$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+$PHP_SELF = 'plot.php';
 
 print '
 <br /><br />