diff options
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search/helpers/search_installer.php | 6 | ||||
| -rw-r--r-- | modules/search/helpers/search_task.php | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php index 05775fec..46f92e83 100644 --- a/modules/search/helpers/search_installer.php +++ b/modules/search/helpers/search_installer.php @@ -22,7 +22,7 @@ class search_installer { $version = module::get_version("search"); $db = Database::instance(); if ($version == 0) { - $db->query("CREATE TABLE `[search_records]` ( + $db->query("CREATE TABLE {search_records} ( `id` int(9) NOT NULL auto_increment, `item_id` int(9), `dirty` boolean default 1, @@ -32,7 +32,7 @@ class search_installer { ENGINE=MyISAM DEFAULT CHARSET=utf8;"); // populate the index with dirty records - $db->query("INSERT INTO `[search_records]` (`item_id`) SELECT `id` FROM `[items]`"); + $db->query("INSERT INTO {search_records} (`item_id`) SELECT `id` FROM {items}"); module::set_version("search", 1); if (ORM::factory("search_record")->count_all() < 10) { @@ -47,7 +47,7 @@ class search_installer { static function uninstall() { $db = Database::instance(); - $db->query("DROP TABLE `[search_records]`"); + $db->query("DROP TABLE {search_records}"); site_status::clear("search_index_out_of_date"); module::delete("search"); } diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php index 0071f2e0..7aba640e 100644 --- a/modules/search/helpers/search_task.php +++ b/modules/search/helpers/search_task.php @@ -21,16 +21,16 @@ class search_task_Core { static function available_tasks() { // Delete extra search_records Database::instance()->query( - "DELETE `[search_records]`.* FROM `[search_records]` " . - "LEFT JOIN `[items]` ON (`[search_records]`.`item_id` = `[items]`.`id`) " . - "WHERE `[items]`.`id` IS NULL"); + "DELETE {search_records}.* FROM {search_records} " . + "LEFT JOIN {items} ON ({search_records}.`item_id` = {items}.`id`) " . + "WHERE {items}.`id` IS NULL"); // Insert missing search_records Database::instance()->query( - "INSERT INTO `[search_records]`(`item_id`) (" . - " SELECT `[items]`.`id` FROM `[items]` " . - " LEFT JOIN `[search_records]` ON (`[search_records]`.`item_id` = `[items]`.`id`) " . - " WHERE `[search_records]`.`id` IS NULL)"); + "INSERT INTO {search_records}(`item_id`) (" . + " SELECT {items}.`id` FROM {items} " . + " LEFT JOIN {search_records} ON ({search_records}.`item_id` = {items}.`id`) " . + " WHERE {search_records}.`id` IS NULL)"); list ($remaining, $total, $percent) = self::_get_stats(); return array(Task_Definition::factory() |