diff options
| author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-06-30 10:00:39 +0400 |
|---|---|---|
| committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-06-30 10:00:39 +0400 |
| commit | 106265a7f8709d6ac95c8600550197725fea5ba3 (patch) | |
| tree | 3c00897d9f01d3f5fba8e3ca2d76f6959d32a2a9 /server_variables.php | |
| parent | 038a81b1a82a05868e65ddf86dab9409aa9ffe17 (diff) | |
| parent | 3b68252564b755b668c3f4f295da4256b9d26ca4 (diff) | |
Resolve conflicts
Diffstat (limited to 'server_variables.php')
| -rw-r--r-- | server_variables.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server_variables.php b/server_variables.php index 6266c5bd25..5617b89f25 100644 --- a/server_variables.php +++ b/server_variables.php @@ -40,7 +40,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { header('Content-Type: text/html; charset=UTF-8'); $varValue = PMA_DBI_fetch_single_row( 'SHOW GLOBAL VARIABLES WHERE Variable_name="' - . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM' + . $common_functions->sqlAddSlashes($_REQUEST['varName']) . '";', 'NUM' ); if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3]) && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte' @@ -60,7 +60,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $exp = array('kb' => 1, 'kib' => 1, 'mb' => 2, 'mib' => 2, 'gb' => 3, 'gib' => 3); $value = floatval($matches[1]) * $common_functions->pow(1024, $exp[strtolower($matches[3])]); } else { - $value = PMA_sqlAddslashes($value); + $value = $common_functions->sqlAddSlashes($value); } if (! is_numeric($value)) { @@ -74,7 +74,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // Some values are rounded down etc. $varValue = PMA_DBI_fetch_single_row( 'SHOW GLOBAL VARIABLES WHERE Variable_name="' - . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM' + . $common_functions->sqlAddSlashes($_REQUEST['varName']) . '";', 'NUM' ); $response->addJSON( 'variable', |