Applied 0007.almaw.home-link-using-l.patch

- Fix link_page to use l() to generate home link.

Applied 0058.kika.themeable-usermenu.patch
- Modifies user menu be themeable.

4 files changed, 10 insertions, 5 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 929644bcb..78eab6609 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -997,14 +997,14 @@ function field_set($string, $name, $value) {
 }
 
 function link_page() {
-  global $custom_links, $base_url;
+  global $custom_links;
 
-  if (is_array($custom_links)) {
+  if (0 && is_array($custom_links)) {
     return $custom_links;
   }
   else {
     $links = module_invoke_all("link", "page");
-    array_unshift($links, "<a href=\"$base_url/\" title=\"". t("Return to the main page.") ."\">". t("home") ."</a>");
+    array_unshift($links, l(t("home"), "", array("title" => t("Return to the main page."))));
     return $links;
   }
 }
diff --git a/misc/drupal.css b/misc/drupal.css
index 2724f0c99..b07334f96 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -75,6 +75,7 @@ th                        { text-align: left; padding-right: 1em; border-bottom:
 .ok                       { color: #080; }
 
 .user-login-block         { text-align: center; }
+.user-page-menu           { text-align: center; }
 .user-login-block, .user-information-block { white-space: nowrap; }
 tr.dark                   { background-color: #ddd; }
 tr.light                  { background-color: #eee; }
diff --git a/modules/user.module b/modules/user.module
index c19015d06..f60d56a3c 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) {
 }
 
 function user_menu() {
+  global $theme;
+
   $links[] = l(t("view user information"), "user/view");
   $links[] = l(t("edit user information"), "user/edit");
   $links[] = l(t("delete account"), "user/delete");
 
-  return "<div style=\"text-align: center;\">". implode(" &middot; ", $links) ."</div>";
+  return "<div class=\"user-page-menu\">". $theme->links($links) ."</div>";
 }
 
 function user_view($uid = 0) {
diff --git a/modules/user/user.module b/modules/user/user.module
index c19015d06..f60d56a3c 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1071,11 +1071,13 @@ function user_edit($edit = array()) {
 }
 
 function user_menu() {
+  global $theme;
+
   $links[] = l(t("view user information"), "user/view");
   $links[] = l(t("edit user information"), "user/edit");
   $links[] = l(t("delete account"), "user/delete");
 
-  return "<div style=\"text-align: center;\">". implode(" &middot; ", $links) ."</div>";
+  return "<div class=\"user-page-menu\">". $theme->links($links) ."</div>";
 }
 
 function user_view($uid = 0) {