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/mysql/php_mysql.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/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index b9288c6bf6..52141f5327 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1841,13 +1841,8 @@ PHP_FUNCTION(mysql_result) if (sql_row[field_offset]) { Z_TYPE_P(return_value) = IS_STRING; - - if (PG(magic_quotes_runtime)) { - Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&Z_STRLEN_P(return_value), 0 TSRMLS_CC); - } else { - Z_STRLEN_P(return_value) = sql_row_lengths[field_offset]; - Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value)); - } + Z_STRLEN_P(return_value) = sql_row_lengths[field_offset]; + Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value)); } else { Z_TYPE_P(return_value) = IS_NULL; } @@ -1970,12 +1965,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, MAKE_STD_ZVAL(data); - if (PG(magic_quotes_runtime)) { - Z_TYPE_P(data) = IS_STRING; - Z_STRVAL_P(data) = php_addslashes(mysql_row[i], mysql_row_lengths[i], &Z_STRLEN_P(data), 0 TSRMLS_CC); - } else { - ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1); - } + ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1); if (result_type & MYSQL_NUM) { add_index_zval(return_value, i, data); |