diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-06-01 22:45:00 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-06-01 22:45:00 +0000 |
| commit | 2be689de86622a917b2bbe48294424f72e19d527 (patch) | |
| tree | ef49177d0b2ddacdf9726476f4305af5a14c5c79 /index_edit.php | |
| parent | 3c211ff6d2625cbb6047586521b3306fdf9507af (diff) | |
| download | webtrees-2be689de86622a917b2bbe48294424f72e19d527.tar.gz webtrees-2be689de86622a917b2bbe48294424f72e19d527.tar.bz2 webtrees-2be689de86622a917b2bbe48294424f72e19d527.zip | |
Quote table names - to allow for "bad" choices of TBLPREFIX
Diffstat (limited to 'index_edit.php')
| -rw-r--r-- | index_edit.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/index_edit.php b/index_edit.php index 1fd8d259a5..0260eb7b33 100644 --- a/index_edit.php +++ b/index_edit.php @@ -86,13 +86,13 @@ foreach (WT_Module::getActiveBlocks() as $name=>$block) { //-- get the blocks list if ($ctype=='user') { if ($action=='reset') { - WT_DB::prepare("DELETE ##block_setting FROM ##block_setting JOIN ##block USING (block_id) WHERE user_id=?")->execute(array(WT_USER_ID)); - WT_DB::prepare("DELETE FROM ##block WHERE user_id=?")->execute(array(WT_USER_ID)); + WT_DB::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE user_id=?")->execute(array(WT_USER_ID)); + WT_DB::prepare("DELETE FROM `##block` WHERE user_id=?")->execute(array(WT_USER_ID)); } $blocks=get_user_blocks(WT_USER_ID); } else { if ($action=='reset') { - WT_DB::prepare("DELETE ##block_setting FROM ##block_setting JOIN ##block USING (block_id) WHERE gedcom_id=?")->execute(array(WT_GED_ID)); + WT_DB::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE gedcom_id=?")->execute(array(WT_GED_ID)); } $blocks=get_gedcom_blocks(WT_GED_ID); } @@ -113,20 +113,20 @@ if ($action=='update') { // Deleted blocks foreach ($blocks[$location] as $block_id=>$block_name) { if (!in_array($block_id, $new_blocks)) { - WT_DB::prepare("DELETE FROM ##block_setting WHERE block_id=?")->execute(array($block_id)); - WT_DB::prepare("DELETE FROM ##block WHERE block_id=?")->execute(array($block_id)); + WT_DB::prepare("DELETE FROM `##block_setting` WHERE block_id=?")->execute(array($block_id)); + WT_DB::prepare("DELETE FROM `##block` WHERE block_id=?")->execute(array($block_id)); } } foreach ($new_blocks as $order=>$block_name) { if (is_numeric($block_name)) { // existing block - WT_DB::prepare("UPDATE ##block SET block_order=? WHERE block_id=?")->execute(array($order, $block_name)); + WT_DB::prepare("UPDATE `##block` SET block_order=? WHERE block_id=?")->execute(array($order, $block_name)); } else { // new block if ($ctype=='user') { - WT_DB::prepare("INSERT INTO ##block (user_id, location, block_order, module_name) VALUES (?, ?, ?, ?)")->execute(array(WT_USER_ID, $location, $order, $block_name)); + WT_DB::prepare("INSERT INTO `##block` (user_id, location, block_order, module_name) VALUES (?, ?, ?, ?)")->execute(array(WT_USER_ID, $location, $order, $block_name)); } else { - WT_DB::prepare("INSERT INTO ##block (gedcom_id, location, block_order, module_name) VALUES (?, ?, ?, ?)")->execute(array(WT_GED_ID, $location, $order, $block_name)); + WT_DB::prepare("INSERT INTO `##block` (gedcom_id, location, block_order, module_name) VALUES (?, ?, ?, ?)")->execute(array(WT_GED_ID, $location, $order, $block_name)); } } } |