summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc6
-rw-r--r--includes/user.inc2
2 files changed, 2 insertions, 6 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 68c2d5adf..b01638d60 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -27,7 +27,7 @@ function theme_init() {
}
function theme_link() {
- global $theme;
+ global $user, $theme;
$links[] = array("index.php", t("home"));
$links[] = array("search.php", t("search"));
$links[] = array("submit.php", t("submit"));
@@ -37,10 +37,6 @@ function theme_link() {
if (module_hook($name, "page")) $links[] = array("module.php?mod=$name", t($name));
}
-// if (module_exist("forum")) $links[] = "<A HREF=\"module.php?mod=forum\">".t("forum") ."</A>";
-// if (module_exist("diary")) $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>";
-// if (module_exist("book")) $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>";
-
return $theme->links($links, 2);
}
diff --git a/includes/user.inc b/includes/user.inc
index 2abdf094a..5e0bf2274 100644
--- a/includes/user.inc
+++ b/includes/user.inc
@@ -82,7 +82,7 @@ function user_validate_name($name) {
if (eregi(" \$", $name)) return t("the username can not end with a space.");
if (eregi(" ", $name)) return t("the username can not contain multiple spaces in a row.");
if (eregi("[^a-zA-Z0-9 ]", $name)) return t("the username contains an illegal character.");
- if (strlen($name) > 15) return t("the username '$name' is too long: it must be less than 15 characters.");
+ if (strlen($name) > 32) return t("the username '$name' is too long: it must be less than 32 characters.");
}
function user_validate_mail($mail) {