From: Thies C. Arntzen <thies@php.net>
Date: Sat, 1 Jan 2000 16:52:14 +0000 (+0000)
Subject: Happy new year (especially to Zeev :)
X-Git-Tag: BEFORE_PRE_SHUTDOWN_REVERSE_PATCH~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e81d9aaca3d67dfeaeab096053332f368ce1ef57;p=php

Happy new year (especially to Zeev :)
---

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;
 }
 /* }}} */