- the user_admin_edit() would loose the theme settings.

- added some more help text to page.module.

4 files changed, 10 insertions, 10 deletions

diff --git a/modules/page.module b/modules/page.module
index 06762b671..44ebabde5 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -145,7 +145,7 @@ function page_form(&$node, &$help, &$error) {
   }
 
   $output .= form_textarea("Body", "body", $node->body, 60, 20);
-  $output .= form_textfield("Link", "link", $node->link, 60, 64);
+  $output .= form_textfield("Navigation link header", "link", $node->link, 60, 64, "To make the page show up on the navigation links enter the name of the link, otherwise leave blank.");
   $output .= form_select("Type", "format", $node->format, array(0 => "HTML / text", 1 => "PHP"));
 
   return $output;
diff --git a/modules/page/page.module b/modules/page/page.module
index 06762b671..44ebabde5 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -145,7 +145,7 @@ function page_form(&$node, &$help, &$error) {
   }
 
   $output .= form_textarea("Body", "body", $node->body, 60, 20);
-  $output .= form_textfield("Link", "link", $node->link, 60, 64);
+  $output .= form_textfield("Navigation link header", "link", $node->link, 60, 64, "To make the page show up on the navigation links enter the name of the link, otherwise leave blank.");
   $output .= form_select("Type", "format", $node->format, array(0 => "HTML / text", 1 => "PHP"));
 
   return $output;
diff --git a/modules/user.module b/modules/user.module
index b671915ab..5242a5b50 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1044,7 +1044,7 @@ function user_delete() {
 }
 
 function user_edit($edit = array()) {
-  global $themes, $user, $languages;
+  global $user, $languages;
 
   if ($user->uid) {
     if ($edit["name"]) {
@@ -1535,7 +1535,7 @@ function user_admin_role($edit = array()) {
 }
 
 function user_admin_edit($edit = array()) {
-  global $op, $id, $themes;
+  global $op, $id;
 
   if ($account = user_load(array("uid" => $id))) {
 
@@ -1617,7 +1617,7 @@ function user_admin_edit($edit = array()) {
 
   $output .= form_textfield(t("Homepage"), "homepage", $account->homepage, 30, 55, t("Optional") .". ". t("Make sure you enter a fully qualified URL: remember to include \"http://\"."));
   foreach (theme_list() as $key => $value) {
-    $options .= "$value[type]<option value=\"$key\"". (($user->theme == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
+    $options .= "$value[type]<option value=\"$key\"". (($account->theme == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
   }
   $output .= form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site."));
   for ($zone = -43200; $zone <= 46800; $zone += 3600) $zones[$zone] = date("l, F dS, Y - h:i A", time() - date("Z") + $zone) ." (GMT ". $zone / 3600 .")";
@@ -1677,7 +1677,7 @@ function admin_access_init() {
 }
 
 function user_admin() {
-  global $edit, $id, $op, $user;
+  global $edit, $id, $op;
 
   if (user_access("administer users")) {
     /*
diff --git a/modules/user/user.module b/modules/user/user.module
index b671915ab..5242a5b50 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1044,7 +1044,7 @@ function user_delete() {
 }
 
 function user_edit($edit = array()) {
-  global $themes, $user, $languages;
+  global $user, $languages;
 
   if ($user->uid) {
     if ($edit["name"]) {
@@ -1535,7 +1535,7 @@ function user_admin_role($edit = array()) {
 }
 
 function user_admin_edit($edit = array()) {
-  global $op, $id, $themes;
+  global $op, $id;
 
   if ($account = user_load(array("uid" => $id))) {
 
@@ -1617,7 +1617,7 @@ function user_admin_edit($edit = array()) {
 
   $output .= form_textfield(t("Homepage"), "homepage", $account->homepage, 30, 55, t("Optional") .". ". t("Make sure you enter a fully qualified URL: remember to include \"http://\"."));
   foreach (theme_list() as $key => $value) {
-    $options .= "$value[type]<option value=\"$key\"". (($user->theme == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
+    $options .= "$value[type]<option value=\"$key\"". (($account->theme == $key) ? " selected=\"selected\"" : "") .">$key - $value->description</option>\n";
   }
   $output .= form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site."));
   for ($zone = -43200; $zone <= 46800; $zone += 3600) $zones[$zone] = date("l, F dS, Y - h:i A", time() - date("Z") + $zone) ." (GMT ". $zone / 3600 .")";
@@ -1677,7 +1677,7 @@ function admin_access_init() {
 }
 
 function user_admin() {
-  global $edit, $id, $op, $user;
+  global $edit, $id, $op;
 
   if (user_access("administer users")) {
     /*