Change the pattern to identify tables that need prefix substitution to

mirror the drupal pattern of using braces {}.

2 files changed, 10 insertions, 10 deletions

diff --git a/modules/exif/helpers/exif_installer.php b/modules/exif/helpers/exif_installer.php
index 964a9e6c..bd994bc3 100644
--- a/modules/exif/helpers/exif_installer.php
+++ b/modules/exif/helpers/exif_installer.php
@@ -23,7 +23,7 @@ class exif_installer {
 
     if ($version == 0) {
       $db = Database::instance();
-      $db->query("CREATE TABLE IF NOT EXISTS `[exif_keys]` (
+      $db->query("CREATE TABLE IF NOT EXISTS {exif_keys} (
                    `id` int(9) NOT NULL auto_increment,
                    `item_id` int(9) NOT NULL,
                    `name` varchar(64) NOT NULL,
@@ -32,7 +32,7 @@ class exif_installer {
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`item_id`, `summary`, `name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-      $db->query("CREATE TABLE IF NOT EXISTS `[exif_records]` (
+      $db->query("CREATE TABLE IF NOT EXISTS {exif_records} (
                    `id` int(9) NOT NULL auto_increment,
                    `item_id` int(9) NOT NULL,
                    `dirty` BOOLEAN default 1,
@@ -44,7 +44,7 @@ class exif_installer {
 
   static function uninstall() {
     $db = Database::instance();
-    $db->query("DROP TABLE IF EXISTS `[exif_keys]`;");
+    $db->query("DROP TABLE IF EXISTS {exif_keys};");
     module::delete("exif");
   }
 }
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 6fdcdcf7..c26b209f 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -23,16 +23,16 @@ class exif_task_Core {
 
     // Delete extra exif_records
     $db->query(
-      "DELETE `[exif_records]`.* FROM `exif_records` " .
-      "LEFT JOIN `[items]` ON (`[exif_records]`.`item_id` = `[items]`.`id`) " .
-      "WHERE `[items]`.`id` IS NULL");
+      "DELETE {exif_records}.* FROM `exif_records` " .
+      "LEFT JOIN {items} ON ({exif_records}.`item_id` = {items}.`id`) " .
+      "WHERE {items}.`id` IS NULL");
 
     // Insert missing exif_records
     $db->query(
-      "INSERT INTO `[exif_record]`(`item_id`) (" .
-      " SELECT `[items]`.`id` FROM `[items]` " .
-      " LEFT JOIN `[exif_records]` ON (`[exif_records]`.`item_id` = `[items]`.`id`) " .
-      " WHERE `[exif_records]`.`id` IS NULL)");
+      "INSERT INTO {exif_record}(`item_id`) (" .
+      " SELECT {items}.`id` FROM {items} " .
+      " LEFT JOIN {exif_records} ON ({exif_records}.`item_id` = {items}.`id`) " .
+      " WHERE {exif_records}.`id` IS NULL)");
 
     list ($remaining, $total, $percent) = self::_get_stats();
     return array(Task_Definition::factory()