diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-05-28 17:07:17 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-05-28 17:07:17 +0000 |
| commit | 802eb597ca73d3ac78cec6da20bf1fc61b40a4c0 (patch) | |
| tree | 89852678c03dded5b04ab986b4c65515c23eebcf /index_edit.php | |
| parent | 6f1418d07350cbf1b07c9d71f5a686cf51c17356 (diff) | |
| download | webtrees-802eb597ca73d3ac78cec6da20bf1fc61b40a4c0.tar.gz webtrees-802eb597ca73d3ac78cec6da20bf1fc61b40a4c0.tar.bz2 webtrees-802eb597ca73d3ac78cec6da20bf1fc61b40a4c0.zip | |
Simplify SQL statements. Use "##table_name" instead of "{$TBLPREFIX}table_name"
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 8cc0e0fd46..1fd8d259a5 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 {$TBLPREFIX}block_setting FROM {$TBLPREFIX}block_setting JOIN {$TBLPREFIX}block USING (block_id) WHERE user_id=?")->execute(array(WT_USER_ID)); - WT_DB::prepare("DELETE FROM {$TBLPREFIX}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 {$TBLPREFIX}block_setting FROM {$TBLPREFIX}block_setting JOIN {$TBLPREFIX}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 {$TBLPREFIX}block_setting WHERE block_id=?")->execute(array($block_id)); - WT_DB::prepare("DELETE FROM {$TBLPREFIX}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 {$TBLPREFIX}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 {$TBLPREFIX}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 {$TBLPREFIX}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)); } } } |