Merge commit 'upstream/master'

2 files changed, 1 insertions, 5 deletions

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index dd18babb..b08cf89d 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -79,7 +79,6 @@ class search_Core {
     $record->data = join(" ", $data);
     $record->dirty = 0;
     $record->save();
-    return t("Search index updated for '%title'", array("title" => p::purify($item->title)));
   }
 
   static function stats() {
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index df1dfe16..5643573a 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -52,7 +52,7 @@ class search_task_Core {
           break;
         }
 
-        $message[] = search::update($item);
+        search::update($item);
         $completed++;
       }
 
@@ -69,13 +69,10 @@ class search_task_Core {
       $task->status = t2("one record updated, index is %percent% up-to-date",
                          "%count records updated, index is %percent% up-to-date",
                          $completed, array("percent" => $percent));
-      $message[] = $task->status;
     } catch (Exception $e) {
       $task->done = true;
       $task->state = "error";
       $task->status = $e->getMessage();
-      $message[] = $e->__toString();
     }
-    $task->log($message);
   }
 }