diff options
author | Michal Čihař <mcihar@suse.cz> | 2011-06-27 16:48:15 +0400 |
---|---|---|
committer | Michal Čihař <mcihar@suse.cz> | 2011-06-27 16:48:15 +0400 |
commit | c9c9fdf49dfde051ce4b94ed8b9f6acc86e25a62 (patch) | |
tree | 88f3a2785f5ad79341b60785eda0c2b9c0ca7926 /tbl_relation.php | |
parent | 6a422caf527226740155c7e3682f2f3c61a85696 (diff) |
Consistent capitalisation of PMA_sqlAddSlashes
Diffstat (limited to 'tbl_relation.php')
-rw-r--r-- | tbl_relation.php | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tbl_relation.php b/tbl_relation.php index 6d82cc31f8..e3f4338e59 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -143,26 +143,26 @@ if (isset($destination) && $cfgRelation['relwork']) { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' . ' values(' - . '\'' . PMA_sqlAddslashes($db) . '\', ' - . '\'' . PMA_sqlAddslashes($table) . '\', ' - . '\'' . PMA_sqlAddslashes($master_field) . '\', ' - . '\'' . PMA_sqlAddslashes($foreign_db) . '\', ' - . '\'' . PMA_sqlAddslashes($foreign_table) . '\',' - . '\'' . PMA_sqlAddslashes($foreign_field) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\', ' + . '\'' . PMA_sqlAddSlashes($table) . '\', ' + . '\'' . PMA_sqlAddSlashes($master_field) . '\', ' + . '\'' . PMA_sqlAddSlashes($foreign_db) . '\', ' + . '\'' . PMA_sqlAddSlashes($foreign_table) . '\',' + . '\'' . PMA_sqlAddSlashes($foreign_field) . '\')'; } elseif ($existrel[$master_field]['foreign_db'] . '.' .$existrel[$master_field]['foreign_table'] . '.' . $existrel[$master_field]['foreign_field'] != $foreign_string) { $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . ' SET' - . ' foreign_db = \'' . PMA_sqlAddslashes($foreign_db) . '\', ' - . ' foreign_table = \'' . PMA_sqlAddslashes($foreign_table) . '\', ' - . ' foreign_field = \'' . PMA_sqlAddslashes($foreign_field) . '\' ' - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\''; + . ' foreign_db = \'' . PMA_sqlAddSlashes($foreign_db) . '\', ' + . ' foreign_table = \'' . PMA_sqlAddSlashes($foreign_table) . '\', ' + . ' foreign_field = \'' . PMA_sqlAddSlashes($foreign_field) . '\' ' + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($master_field) . '\''; } // end if... else.... } elseif (isset($existrel[$master_field])) { $upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) - . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND master_table = \'' . PMA_sqlAddslashes($table) . '\'' - . ' AND master_field = \'' . PMA_sqlAddslashes($master_field) . '\''; + . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND master_table = \'' . PMA_sqlAddSlashes($table) . '\'' + . ' AND master_field = \'' . PMA_sqlAddSlashes($master_field) . '\''; } // end if... else.... if ($upd_query) { PMA_query_as_controluser($upd_query); @@ -299,21 +299,21 @@ if ($cfgRelation['displaywork'] && isset($display_field)) { if ($disp) { if ($display_field != '') { $upd_query = 'UPDATE ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' SET display_field = \'' . PMA_sqlAddslashes($display_field) . '\'' - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' SET display_field = \'' . PMA_sqlAddSlashes($display_field) . '\'' + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } else { $upd_query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) - . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddslashes($table) . '\''; + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($table) . '\''; } } elseif ($display_field != '') { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_info']) . '(db_name, table_name, display_field) ' . ' VALUES(' - . '\'' . PMA_sqlAddslashes($db) . '\',' - . '\'' . PMA_sqlAddslashes($table) . '\',' - . '\'' . PMA_sqlAddslashes($display_field) . '\')'; + . '\'' . PMA_sqlAddSlashes($db) . '\',' + . '\'' . PMA_sqlAddSlashes($table) . '\',' + . '\'' . PMA_sqlAddSlashes($display_field) . '\')'; } if ($upd_query) { |