diff options
| author | Pierre Joye <pajoye@php.net> | 2011-07-22 11:25:30 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-07-22 11:25:30 +0000 |
| commit | 9805e1674aefbc9e2a529a7351a045dab0282eb4 (patch) | |
| tree | 05cd4674efea52fbd134237f26ef48b57f67a9b6 /ext/pgsql/pgsql.c | |
| parent | 8bfb9bcd0171eb6e578f1fc8f79e07c83fbcb403 (diff) | |
| download | php-git-9805e1674aefbc9e2a529a7351a045dab0282eb4.tar.gz | |
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 9ab1a071e6..c2dd8b4a27 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -2499,12 +2499,8 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int should_copy=0; const uint element_len = strlen(element); - if (PG(magic_quotes_runtime)) { - data = php_addslashes(element, element_len, &data_len, 0 TSRMLS_CC); - } else { - data = safe_estrndup(element, element_len); - data_len = element_len; - } + data = safe_estrndup(element, element_len); + data_len = element_len; if (result_type & PGSQL_NUM) { add_index_stringl(return_value, i, data, data_len, should_copy); @@ -6213,12 +6209,9 @@ PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array TS size_t data_len; const size_t element_len = strlen(element); - if (PG(magic_quotes_runtime)) { - data = php_addslashes(element, element_len, &data_len, 0 TSRMLS_CC); - } else { - data = safe_estrndup(element, element_len); - data_len = element_len; - } + data = safe_estrndup(element, element_len); + data_len = element_len; + field_name = PQfname(pg_result, i); add_assoc_stringl(row, field_name, data, data_len, 0); } |