summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli.c
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-07-22 11:25:30 +0000
committerPierre Joye <pajoye@php.net>2011-07-22 11:25:30 +0000
commitcc1c7af0375db5b7ad2c7752569b925cc3372377 (patch)
tree0bf43f30b0e5a4286a01da613bf901b92f9f9b3c /ext/mysqli/mysqli.c
parent5ef9ab3b03867e8644b5140d618842199ef69202 (diff)
downloadphp-git-cc1c7af0375db5b7ad2c7752569b925cc3372377.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/mysqli/mysqli.c')
-rw-r--r--ext/mysqli/mysqli.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index add2d123d8..b784ff863f 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1137,13 +1137,17 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, long
#endif
{
+#if PHP_API_VERSION < 20100412
/* 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 {
+#endif
ZVAL_STRINGL(res, row[i], field_len[i], 1);
+#if PHP_API_VERSION < 20100412
}
+#endif
}
if (fetchtype & MYSQLI_NUM) {