diff options
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | modules/page.module | 4 | ||||
| -rw-r--r-- | modules/page/page.module | 4 | ||||
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/includes/common.inc b/includes/common.inc index 2307983d7..900b80080 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -554,10 +554,10 @@ function format_name($object) { if ($object->uid && $object->name) { if (strstr($PHP_SELF, "admin.php")) { - $output = la($object->name, array("mod" => "user", "op" => "edit", "id" => $object->uid)); + $output = la($object->name, array("mod" => "user", "op" => "edit", "id" => $object->uid), "", array("title" => t("Administer user profile."))); } else { - $output = lm($object->name, array("mod" => "user", "op" => "view", "id" => $object->uid)); + $output = lm($object->name, array("mod" => "user", "op" => "view", "id" => $object->uid), "", array("title" => t("View user profile."))); } } else { @@ -674,7 +674,7 @@ function lm($text, $args = array(), $anchor = "", $attributes = array()) { } function field_get($string, $name) { - ereg(",$name=([^,]+)", ",$string", $regs); + ereg(", $name=([^,]+)", ",$string", $regs); return $regs[1]; } diff --git a/modules/page.module b/modules/page.module index f326f4254..41e8e55c0 100644 --- a/modules/page.module +++ b/modules/page.module @@ -64,9 +64,9 @@ function page_load($node) { function page_link($type) { if ($type == "page" && user_access("access content")) { - $result = db_query("SELECT n.nid, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link"); + $result = db_query("SELECT n.nid, n.title, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link"); while ($page = db_fetch_object($result)) { - $links[] = l($page->link, array("id" => $page->nid)); + $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->title)); } } diff --git a/modules/page/page.module b/modules/page/page.module index f326f4254..41e8e55c0 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -64,9 +64,9 @@ function page_load($node) { function page_link($type) { if ($type == "page" && user_access("access content")) { - $result = db_query("SELECT n.nid, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link"); + $result = db_query("SELECT n.nid, n.title, p.link FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' ORDER BY p.link"); while ($page = db_fetch_object($result)) { - $links[] = l($page->link, array("id" => $page->nid)); + $links[] = l($page->link, array("id" => $page->nid), "node", "", array("title" => $page->title)); } } diff --git a/modules/user.module b/modules/user.module index 245a00a54..bc989c788 100644 --- a/modules/user.module +++ b/modules/user.module @@ -384,7 +384,7 @@ function user_link($type) { if ($type == "menu.misc") { if (user_access("access administration pages")) { - $links[] = la(t("administer %a", array("%a" => variable_get("site_name", "drupal")))); + $links[] = la(t("administer %a", array("%a" => variable_get("site_name", "drupal"))), array(), "", array("title" => t("Access administration pages."))); } $links[] = lm(t("logout"), array("mod" => "user", "op" => "logout"), "", array("title" => t("Logout."))); diff --git a/modules/user/user.module b/modules/user/user.module index 245a00a54..bc989c788 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -384,7 +384,7 @@ function user_link($type) { if ($type == "menu.misc") { if (user_access("access administration pages")) { - $links[] = la(t("administer %a", array("%a" => variable_get("site_name", "drupal")))); + $links[] = la(t("administer %a", array("%a" => variable_get("site_name", "drupal"))), array(), "", array("title" => t("Access administration pages."))); } $links[] = lm(t("logout"), array("mod" => "user", "op" => "logout"), "", array("title" => t("Logout."))); |