diff options
| author | Pierre Joye <pajoye@php.net> | 2006-03-08 00:43:32 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2006-03-08 00:43:32 +0000 |
| commit | bb1ec86f9da24fe6b49bae68353d53ba96b7228f (patch) | |
| tree | 8a395f4ff82f2bfc5dfbb143231340c80ec3d9e4 /ext/msql/php_msql.c | |
| parent | b7d6d705f1e471544418cf8febb62943ece9e8ce (diff) | |
| download | php-git-bb1ec86f9da24fe6b49bae68353d53ba96b7228f.tar.gz | |
- remove magic_quotes_gpc, magic_quotes_runtime, magic_quotes_sybase
(calling ini_set('magic_....') returns 0|false
- get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return false
- set_magic_quotes_runtime raises an E_CORE_ERROR
Diffstat (limited to 'ext/msql/php_msql.c')
| -rw-r--r-- | ext/msql/php_msql.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index ded73a1b17..e661efa9ea 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -844,12 +844,8 @@ PHP_FUNCTION(msql_result) } if (sql_row[field_offset]) { - if (PG(magic_quotes_runtime)) { - Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset],0,&Z_STRLEN_P(return_value),0 TSRMLS_CC); - } else { - Z_STRLEN_P(return_value) = (sql_row[field_offset]?strlen(sql_row[field_offset]):0); - Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset],Z_STRLEN_P(return_value)); - } + Z_STRLEN_P(return_value) = (sql_row[field_offset]?strlen(sql_row[field_offset]):0); + Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset],Z_STRLEN_P(return_value)); Z_TYPE_P(return_value) = IS_STRING; } else { ZVAL_FALSE(return_value); @@ -940,14 +936,9 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) int data_len; int should_copy; - if (PG(magic_quotes_runtime)) { - data = php_addslashes(msql_row[i], 0, &data_len, 0 TSRMLS_CC); - should_copy = 0; - } else { - data = msql_row[i]; - data_len = strlen(data); - should_copy = 1; - } + data = msql_row[i]; + data_len = strlen(data); + should_copy = 1; if (result_type & MSQL_NUM) { add_index_stringl(return_value, i, data, data_len, should_copy); |