Commit 1bb17750 authored by Russ Fish's avatar Russ Fish
Browse files

Don't send usr_addr2 if not changed, like everything else.

Used to be treated specially.
parent 3164ca14
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
include("defs.php3"); include("defs.php3");
# #
# No PAGEHEADER since we spit out a Location header later. See below. # No PAGEHEADER here since we spit out a Location header later. See below.
# #
# We want to allow logged in users with expired passwords to change them. # We want to allow logged in users with expired passwords to change them.
# #
...@@ -50,6 +50,7 @@ function SPITFORM($formfields, $errors) ...@@ -50,6 +50,7 @@ function SPITFORM($formfields, $errors)
# expiration interaction. See below. # expiration interaction. See below.
# #
PAGEHEADER("Modify User Information"); PAGEHEADER("Modify User Information");
###STARTBUSY("Making user profile changes");
if ($errors) { if ($errors) {
echo "<table class=nogrid echo "<table class=nogrid
...@@ -506,7 +507,8 @@ if (isset($formfields["usr_addr"]) && $formfields["usr_addr"] != "" && ...@@ -506,7 +507,8 @@ if (isset($formfields["usr_addr"]) && $formfields["usr_addr"] != "" &&
$formfields["usr_addr"] != $target_user->addr()) { $formfields["usr_addr"] != $target_user->addr()) {
$args["usr_addr"] = $formfields["usr_addr"]; $args["usr_addr"] = $formfields["usr_addr"];
} }
if (isset($formfields["usr_addr2"]) && $formfields["usr_addr2"] != "") { if (isset($formfields["usr_addr2"]) && $formfields["usr_addr2"] != "" &&
$formfields["usr_addr2"] != $target_user->addr2()) {
$args["usr_addr2"] = $formfields["usr_addr2"]; $args["usr_addr2"] = $formfields["usr_addr2"];
} }
if (isset($formfields["usr_city"]) && $formfields["usr_city"] != "" && if (isset($formfields["usr_city"]) && $formfields["usr_city"] != "" &&
...@@ -548,6 +550,8 @@ if (! ($result = User::ModUserInfo($target_user, $args, $errors))) { ...@@ -548,6 +550,8 @@ if (! ($result = User::ModUserInfo($target_user, $args, $errors))) {
PAGEHEADER("Modify User Information"); PAGEHEADER("Modify User Information");
###STOPBUSY();
echo "<center><h3>Done!</h3></center>\n"; echo "<center><h3>Done!</h3></center>\n";
PAGEREPLACE(CreateURL("showuser", $target_user) . "#PROFILE"); PAGEREPLACE(CreateURL("showuser", $target_user) . "#PROFILE");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment