Change search callbacks to use the event system, so move them out of

xxx_search helpers and into xxx_event helpers.

2 files changed, 11 insertions, 34 deletions

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 614c7c65..0234aea9 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -38,4 +38,15 @@ class comment_event_Core {
                ->url("#comments")
                ->css_id("gCommentsLink"));
   }
+
+  static function item_index_data($item, $data) {
+    foreach (Database::instance()
+             ->select("text")
+             ->from("comments")
+             ->where("item_id", $item->id)
+             ->get()
+             ->as_array() as $row) {
+      $data[] = $row->text;
+    }
+  }
 }
diff --git a/modules/comment/helpers/comment_search.php b/modules/comment/helpers/comment_search.php
deleted file mode 100644
index 29762eae..00000000
--- a/modules/comment/helpers/comment_search.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-class Comment_Search_Core {
-  static function item_index_data($item) {
-    $data = array();
-    foreach (Database::instance()
-             ->select("text")
-             ->from("comments")
-             ->where("item_id", $item->id)
-             ->get()
-             ->as_array() as $row) {
-      $data[] = $row->text;
-    }
-    return join(" ", $data);
-  }
-}