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/pgsql/pgsql.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/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 d52d2b4519..99d5ab5434 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1962,12 +1962,8 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int data_len; int should_copy=0; - 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); @@ -5583,12 +5579,9 @@ PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array TS element = PQgetvalue(pg_result, pg_row, i); element_len = (element ? strlen(element) : 0); if (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); } |