Index: filestore.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/filestore/filestore.module,v
retrieving revision 1.47
diff -u -r1.47 filestore.module
--- filestore.module	21 Dec 2003 21:18:52 -0000	1.47
+++ filestore.module	2 Apr 2004 03:43:33 -0000
@@ -454,8 +454,7 @@
   return $error;
 }
 
-
-function filestore_form(&$node, &$help, &$error, &$param) {
+function filestore_form(&$node, &$error, &$param ) {
   global $user, $op, $edit_type, $HTTP_ENV_VARS;
 
   $HTTP_ENV_VARS["TMPDIR"] = variable_get(filestore_tmp_dir, "/tmp/");
@@ -531,11 +530,11 @@
 
 function filestore_search($keys) {
   global $user;
-  $result = db_query("SELECT n.*, f.* FROM {filestore} f LEFT JOIN {node} n ON n.nid = f.nid WHERE n.status = '1' AND (n.title LIKE '%$keys%' OR n.body LIKE '%$keys%' OR f.fileauthor LIKE '%$keys%' OR f.filename LIKE '%$keys%') LIMIT 20");
+  $result = db_query("SELECT n.*, f.*, u.* FROM {filestore} f LEFT JOIN {node} n ON n.nid = f.nid LEFT JOIN {users} u ON n.uid = u.uid WHERE n.status = '1' AND (n.title LIKE '%$keys%' OR n.body LIKE '%$keys%' OR f.fileauthor LIKE '%$keys%' OR f.filename LIKE '%$keys%') LIMIT 20");
   while ($file = db_fetch_object($result)) {
     $find[$i++] = array("title" => check_output($file->title), "link" => (user_access($user, "administer nodes") ? "admin/node/edit/$file->nid" : "node/view/$file->nid"), "user" => $file->name, "date" => $file->changed);
   }
-  return $find;
+  return array(t('Matching file ranked in order of relevance'),$find);
 }