summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2006-03-08 00:43:32 +0000
committerPierre Joye <pajoye@php.net>2006-03-08 00:43:32 +0000
commitbb1ec86f9da24fe6b49bae68353d53ba96b7228f (patch)
tree8a395f4ff82f2bfc5dfbb143231340c80ec3d9e4 /ext/mysqli/mysqli.c
parentb7d6d705f1e471544418cf8febb62943ece9e8ce (diff)
downloadphp-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/mysqli/mysqli.c')
-rw-r--r--ext/mysqli/mysqli.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 0e5305cd80..8b1ca3bff6 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -815,13 +815,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
MAKE_STD_ZVAL(res);
- /* check if we need magic quotes */
- if (PG(magic_quotes_runtime)) {
- Z_TYPE_P(res) = IS_STRING;
- Z_STRVAL_P(res) = php_addslashes(row[i], field_len[i], &Z_STRLEN_P(res), 0 TSRMLS_CC);
- } else {
- ZVAL_STRINGL(res, row[i], field_len[i], 1);
- }
+ ZVAL_STRINGL(res, row[i], field_len[i], 1);
if (fetchtype & MYSQLI_NUM) {
add_index_zval(return_value, i, res);