diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-11-27 18:49:05 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-11-27 18:49:05 +0000 |
| commit | 0f5a7b61518fddb6522da7e3c716e8c262454d34 (patch) | |
| tree | fc1c719126c65453033c084fb51f23e0828be326 | |
| parent | 1b733dc98aaeb20d250414acc6bf428c7868d013 (diff) | |
| download | brdo-0f5a7b61518fddb6522da7e3c716e8c262454d34.tar.gz brdo-0f5a7b61518fddb6522da7e3c716e8c262454d34.tar.bz2 | |
- Made the page description optional. Reported by Ax.
| -rw-r--r-- | modules/page.module | 4 | ||||
| -rw-r--r-- | modules/page/page.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/page.module b/modules/page.module index 6761fe505..ef68a5632 100644 --- a/modules/page.module +++ b/modules/page.module @@ -64,7 +64,7 @@ function page_load($node) { function page_link($type) { if ($type == "page" && user_access("access content")) { - $result = db_query("SELECT n.nid, n.title, p.link, p.description FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' AND p.description != '' ORDER BY p.link"); + $result = db_query("SELECT n.nid, n.title, p.link, p.description 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), "node", "", array("title" => $page->description)); } @@ -151,7 +151,7 @@ function page_form(&$node, &$help, &$error) { $output .= form_textarea(t("Body"), "body", $node->body, 60, 20); $output .= form_textfield(t("Link name"), "link", $node->link, 60, 64, t("To make the page show up in the navigation links, enter the name of the link, otherwise leave blank.")); - $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link.")); + $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link. Leave blank when you don't want a description.")); $output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); return $output; diff --git a/modules/page/page.module b/modules/page/page.module index 6761fe505..ef68a5632 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -64,7 +64,7 @@ function page_load($node) { function page_link($type) { if ($type == "page" && user_access("access content")) { - $result = db_query("SELECT n.nid, n.title, p.link, p.description FROM page p LEFT JOIN node n ON p.nid = n.nid WHERE n.status = '1' AND p.link != '' AND p.description != '' ORDER BY p.link"); + $result = db_query("SELECT n.nid, n.title, p.link, p.description 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), "node", "", array("title" => $page->description)); } @@ -151,7 +151,7 @@ function page_form(&$node, &$help, &$error) { $output .= form_textarea(t("Body"), "body", $node->body, 60, 20); $output .= form_textfield(t("Link name"), "link", $node->link, 60, 64, t("To make the page show up in the navigation links, enter the name of the link, otherwise leave blank.")); - $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link.")); + $output .= form_textfield(t("Link description"), "description", $node->description, 60, 64, t("The description displayed when hovering over the page's link. Leave blank when you don't want a description.")); $output .= form_select(t("Type"), "format", $node->format, array(0 => "HTML / text", 1 => "PHP")); return $output; |