- Usability improvement: avoid showing two login forms on one page. Suggested by Keith.

e5f2c1ef · Dries · bbf78ea1 · e5f2c1ef · e5f2c1ef
Commit e5f2c1ef authored Jun 15, 2003 by Dries
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

modules/user.module modules/user.module +9 -0

modules/user/user.module modules/user/user.module +9 -0

No files found.
--- a/modules/user.module
+++ b/modules/user.module
@@ -328,6 +328,15 @@ function user_block($op = "list", $delta = 0) {
    switch ($delta) {
      case 0:
        if (!$user->uid) {
+          /*
+          ** For usability's sake, avoid showing two login forms on one
+          ** page.
+          */
+
+          if (arg(0) == "user" && arg(1) != "view") {
+            return;
+          }
+
          $output = "<div class=\"user-login-block\">\n";

          /*

--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -328,6 +328,15 @@ function user_block($op = "list", $delta = 0) {
    switch ($delta) {
      case 0:
        if (!$user->uid) {
+          /*
+          ** For usability's sake, avoid showing two login forms on one
+          ** page.
+          */
+
+          if (arg(0) == "user" && arg(1) != "view") {
+            return;
+          }
+
          $output = "<div class=\"user-login-block\">\n";

          /*