--- embedaddon/php/ext/mssql/php_mssql.c 2012/02/21 23:47:58 1.1.1.1 +++ embedaddon/php/ext/mssql/php_mssql.c 2012/05/29 12:34:40 1.1.1.2 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.1.1.1 2012/02/21 23:47:58 misho Exp $ */ +/* $Id: php_mssql.c,v 1.1.1.2 2012/05/29 12:34:40 misho Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1527,27 +1527,17 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PAR if (Z_TYPE(result->data[result->cur_row][i]) != IS_NULL) { char *data; int data_len; - int should_copy; if (Z_TYPE(result->data[result->cur_row][i]) == IS_STRING) { - if (PG(magic_quotes_runtime)) { - data = php_addslashes(Z_STRVAL(result->data[result->cur_row][i]), Z_STRLEN(result->data[result->cur_row][i]), &data_len, 0 TSRMLS_CC); - should_copy = 0; - } - else - { - data = Z_STRVAL(result->data[result->cur_row][i]); - data_len = Z_STRLEN(result->data[result->cur_row][i]); - should_copy = 1; - } + data = Z_STRVAL(result->data[result->cur_row][i]); + data_len = Z_STRLEN(result->data[result->cur_row][i]); if (result_type & MSSQL_NUM) { - add_index_stringl(return_value, i, data, data_len, should_copy); - should_copy = 1; + add_index_stringl(return_value, i, data, data_len, 1); } if (result_type & MSSQL_ASSOC) { - add_assoc_stringl(return_value, result->fields[i].name, data, data_len, should_copy); + add_assoc_stringl(return_value, result->fields[i].name, data, data_len, 1); } } else if (Z_TYPE(result->data[result->cur_row][i]) == IS_LONG) { @@ -2005,7 +1995,7 @@ PHP_FUNCTION(mssql_init) statement->link = mssql_ptr; statement->executed=FALSE; - statement->id = zend_list_insert(statement,le_statement); + statement->id = zend_list_insert(statement,le_statement TSRMLS_CC); RETURN_RESOURCE(statement->id); }