- Merged "system settings" and "module settings" into one page. IMHO

  it wasn't a good idea to split them up in first place, and it turned
  out to be quite hard to decide where to put some variables.

  Also moved some variables around and even renamed a few variables
  while doing so.

- Added a page_header() and page_footer() to all top-level .php pages.

2 files changed, 9 insertions, 3 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 54e19bd6c..ac78a5d4c 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -250,11 +250,17 @@ function timer_print() {
 }
 
 function page_header() {
-  if (variable_get("dev_timer", 0)) timer_start();
+  global $user;
+
+  if (variable_get("dev_timer", 0)) {
+    timer_start();
+  }
 }
 
 function page_footer() {
-  if (variable_get("dev_timer", 0)) timer_print();
+  if (variable_get("dev_timer", 0)) {
+    timer_print();
+  }
 }
 
 $conf = conf_init();
diff --git a/includes/theme.inc b/includes/theme.inc
index c6e397d1a..ff0e93167 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -81,7 +81,7 @@ function theme_account($theme) {
     $output .= "  <B>". t("Username") .":</B><BR><INPUT NAME=\"userid\" SIZE=\"15\"><P>\n";
     $output .= "  <B>". t("Password") .":</B><BR><INPUT NAME=\"passwd\" SIZE=\"15\" TYPE=\"password\"><BR>\n";
     $output .= "  <INPUT TYPE=\"submit\" VALUE=\"". t("Login") ."\"><BR>\n";
-    if (variable_get("account_reg_allow", 1)) $output .= "  <A HREF=\"account.php\">". t("REGISTER") ."</A>\n";
+    if (variable_get("account_register", 1)) $output .= "  <A HREF=\"account.php\">". t("REGISTER") ."</A>\n";
     $output .= " </FORM>\n";
     $output .= "</DIV>\n";