diff options
| author | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-05-02 20:32:36 +0000 |
|---|---|---|
| committer | Kjartan Mannes <kjartan@2.no-reply.drupal.org> | 2002-05-02 20:32:36 +0000 |
| commit | a93b2a174020f373b434b339b0e9470b1782c276 (patch) | |
| tree | 26cf43178ff0ac5861c9a5b6dd7d228229586bf4 | |
| parent | 837041f11529b59cafe0564a2dd4d341f2b0155a (diff) | |
| download | brdo-a93b2a174020f373b434b339b0e9470b1782c276.tar.gz brdo-a93b2a174020f373b434b339b0e9470b1782c276.tar.bz2 | |
- user.module used a obsolete variable_get.
- set blocks for new users.
| -rw-r--r-- | modules/block.module | 8 | ||||
| -rw-r--r-- | modules/block/block.module | 8 | ||||
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/modules/block.module b/modules/block.module index 9b9d64ee2..60ea18e96 100644 --- a/modules/block.module +++ b/modules/block.module @@ -248,6 +248,14 @@ function block_admin() { function block_user($type, &$edit, &$user) { switch ($type) { + case "register_form": + $result = db_query("SELECT * FROM blocks WHERE custom = '%d' ORDER BY name", 1); + + while ($block = db_fetch_object($result)) { + $form .= form_hidden("block][$block->name", $block->status); + } + + return $form; case "edit_form": $result = db_query("SELECT * FROM blocks WHERE custom = '%d' ORDER BY name", 1); diff --git a/modules/block/block.module b/modules/block/block.module index 9b9d64ee2..60ea18e96 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -248,6 +248,14 @@ function block_admin() { function block_user($type, &$edit, &$user) { switch ($type) { + case "register_form": + $result = db_query("SELECT * FROM blocks WHERE custom = '%d' ORDER BY name", 1); + + while ($block = db_fetch_object($result)) { + $form .= form_hidden("block][$block->name", $block->status); + } + + return $form; case "edit_form": $result = db_query("SELECT * FROM blocks WHERE custom = '%d' ORDER BY name", 1); diff --git a/modules/user.module b/modules/user.module index b3815ee30..df8dbe316 100644 --- a/modules/user.module +++ b/modules/user.module @@ -480,7 +480,7 @@ function user_block() { $output .= "<input name=\"edit[remember_me]\" type=\"checkbox\" />". t("Remember me") ."<br />\n"; $output .= "<input name=\"edit[op]\" type=\"submit\" value=\"". t("Log in") ."\" /><br />\n"; $output .= "</form></div>\n"; - if (variable_get("account_register", 1)) { + if (variable_get("user_register", 1)) { $output .= "» ". lm(t("Register"), array("mod" => "user", "op" => "register"), t("Create a new user account.")) ."\n"; } $output .= "<br />» ". lm(t("New password"), array("mod" => "user", "op" => "password"), t("Request new password via e-mail")) ."<br />"; diff --git a/modules/user/user.module b/modules/user/user.module index b3815ee30..df8dbe316 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -480,7 +480,7 @@ function user_block() { $output .= "<input name=\"edit[remember_me]\" type=\"checkbox\" />". t("Remember me") ."<br />\n"; $output .= "<input name=\"edit[op]\" type=\"submit\" value=\"". t("Log in") ."\" /><br />\n"; $output .= "</form></div>\n"; - if (variable_get("account_register", 1)) { + if (variable_get("user_register", 1)) { $output .= "» ". lm(t("Register"), array("mod" => "user", "op" => "register"), t("Create a new user account.")) ."\n"; } $output .= "<br />» ". lm(t("New password"), array("mod" => "user", "op" => "password"), t("Request new password via e-mail")) ."<br />"; |