summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>2000-01-01 16:52:14 +0000
committerThies C. Arntzen <thies@php.net>2000-01-01 16:52:14 +0000
commite81d9aaca3d67dfeaeab096053332f368ce1ef57 (patch)
tree0bbf5871c8bf127c0c31a58e322a28fa924cf2eb /ext/mysql/php_mysql.c
parenta6d4b30d1900a31c128f0809b95e344cfa9ff201 (diff)
downloadphp-git-e81d9aaca3d67dfeaeab096053332f368ce1ef57.tar.gz
Happy new year (especially to Zeev :)
Diffstat (limited to 'ext/mysql/php_mysql.c')
-rw-r--r--ext/mysql/php_mysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index fa5277b105..02e68f638a 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1247,6 +1247,8 @@ PHP_FUNCTION(mysql_result)
}
}
+ return_value->type = IS_STRING;
+
if (sql_row[field_offset]) {
if (PG(magic_quotes_runtime)) {
return_value->value.str.val = php_addslashes(sql_row[field_offset],sql_row_lengths[field_offset],&return_value->value.str.len,0);
@@ -1257,8 +1259,6 @@ PHP_FUNCTION(mysql_result)
} else {
return_value->type = IS_UNSET;
}
-
- return_value->type = IS_STRING;
}
/* }}} */