diff --git a/CHANGELOG b/CHANGELOG index cf47bb624fab..ad96985fbd31 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,7 +13,7 @@ drupal x.xx, xx/xx/xxxx - various updates: * improved the search system by making it context sensitive. * fixed various HTML/XHTML typos. - + drupal 3.00, 15/09/2001 ----------------------- - major overhaul of the entire underlying design: diff --git a/includes/search.inc b/includes/search.inc index e3062496ac37..e05b527d63fc 100644 --- a/includes/search.inc +++ b/includes/search.inc @@ -2,14 +2,17 @@ function search_form($keys) { global $REQUEST_URI; + $output .= "
\n"; $output .= " "; $output .= " \n"; $output .= "
\n"; + return $output; } function search_data($keys, $type) { + if ($keys && $type && $result = module_invoke($type, "search", check_query($keys))) { foreach ($result as $entry) { $output .= "

\n"; diff --git a/modules/aggregator.module b/modules/aggregator.module index 98228f8ca5e3..55f321f9e53b 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) { $form .= form_submit("Submit"); if ($edit[bid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("bid", $edit[bid]); } @@ -278,7 +278,7 @@ function import_form_feed($edit = array()) { $form .= form_submit("Submit"); if ($edit[fid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("fid", $edit[fid]); } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 98228f8ca5e3..55f321f9e53b 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) { $form .= form_submit("Submit"); if ($edit[bid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("bid", $edit[bid]); } @@ -278,7 +278,7 @@ function import_form_feed($edit = array()) { $form .= form_submit("Submit"); if ($edit[fid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("fid", $edit[fid]); } diff --git a/modules/blog.module b/modules/blog.module index eeee99f8d201..df53e2b4923d 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -100,7 +100,7 @@ function blog_page_user($uid = 0, $date = 0) { $output .= "uid&date=". mktime(23, 59, 59, date("n", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp)) ."\">". format_date($blog->timestamp, custom, "d M Y") .":"; } - if ($user->uid && $user->name == $name) { + if ($user->uid && $user->uid == $uid) { $links[] = "nid\">". t("edit") .""; } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index eeee99f8d201..df53e2b4923d 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -100,7 +100,7 @@ function blog_page_user($uid = 0, $date = 0) { $output .= "uid&date=". mktime(23, 59, 59, date("n", $blog->timestamp), date("d", $blog->timestamp), date("Y", $blog->timestamp)) ."\">". format_date($blog->timestamp, custom, "d M Y") .":"; } - if ($user->uid && $user->name == $name) { + if ($user->uid && $user->uid == $uid) { $links[] = "nid\">". t("edit") .""; } diff --git a/modules/import.module b/modules/import.module index 98228f8ca5e3..55f321f9e53b 100644 --- a/modules/import.module +++ b/modules/import.module @@ -240,7 +240,7 @@ function import_form_bundle($edit = array()) { $form .= form_submit("Submit"); if ($edit[bid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("bid", $edit[bid]); } @@ -278,7 +278,7 @@ function import_form_feed($edit = array()) { $form .= form_submit("Submit"); if ($edit[fid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("fid", $edit[fid]); } diff --git a/modules/meta.module b/modules/meta.module index 32ef449c92eb..c80c1e462253 100644 --- a/modules/meta.module +++ b/modules/meta.module @@ -67,7 +67,7 @@ function meta_form_collection($edit = array()) { $form .= form_submit("Submit"); if ($edit[cid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("cid", $edit[cid]); } @@ -83,7 +83,7 @@ function meta_form_tag($edit = array()) { $form .= form_submit("Submit"); if ($edit[tid]) { - $form .= form_submit(t("Delete")); + $form .= form_submit("Delete"); $form .= form_hidden("tid", $edit[tid]); } diff --git a/modules/node.module b/modules/node.module index 74160311d60c..428f3c4ba977 100644 --- a/modules/node.module +++ b/modules/node.module @@ -3,6 +3,10 @@ class Node { function Node($node) { global $user; + $this->uid = $node[uid] ? $node[uid] : $user->uid; + $this->nid = $node[nid]; + $this->type = $node[type]; + $this->comment = $node[comment] ? $node[comment] : $this->name = $node[name] ? $node[name] : $user->name; $this->title = $node[title]; $this->attributes = $node[attributes]; diff --git a/modules/node/node.module b/modules/node/node.module index 74160311d60c..428f3c4ba977 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -3,6 +3,10 @@ class Node { function Node($node) { global $user; + $this->uid = $node[uid] ? $node[uid] : $user->uid; + $this->nid = $node[nid]; + $this->type = $node[type]; + $this->comment = $node[comment] ? $node[comment] : $this->name = $node[name] ? $node[name] : $user->name; $this->title = $node[title]; $this->attributes = $node[attributes]; diff --git a/modules/search.module b/modules/search.module index 86049d67d456..afe827b2e6fb 100644 --- a/modules/search.module +++ b/modules/search.module @@ -17,7 +17,7 @@ function search_item($item, $type) { $output .= " ". $item["title"] ."
"; $output .= " $type ". ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") .""; $output .= "

"; - + return $output; } @@ -70,7 +70,7 @@ function search_page() { /* ** Display form and search results: */ - + $theme->header(); if ($form) { diff --git a/modules/search/search.module b/modules/search/search.module index 86049d67d456..afe827b2e6fb 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -17,7 +17,7 @@ function search_item($item, $type) { $output .= " ". $item["title"] ."
"; $output .= " $type ". ($item["user"] ? " - ". $item["user"] : "") ."". ($item["date"] ? " - ". format_date($item["date"], "small") : "") .""; $output .= "

"; - + return $output; } @@ -70,7 +70,7 @@ function search_page() { /* ** Display form and search results: */ - + $theme->header(); if ($form) {