--- embedaddon/php/ext/standard/ftp_fopen_wrapper.c	2012/02/21 23:48:02	1.1.1.1
+++ embedaddon/php/ext/standard/ftp_fopen_wrapper.c	2012/05/29 12:34:43	1.1.1.2
@@ -18,7 +18,7 @@
    |          Sara Golemon <pollita@php.net>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.1.1.1 2012/02/21 23:48:02 misho Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.1.1.2 2012/05/29 12:34:43 misho Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -269,9 +269,8 @@ static php_stream *php_ftp_fopen_connect(php_stream_wr
 		} else {
 			/* if the user has configured who they are,
 			   send that as the password */
-			char *from_address = php_ini_string("from", sizeof("from"), 0);
-			if (from_address[0] != '\0') {
-				php_stream_printf(stream TSRMLS_CC, "PASS %s\r\n", from_address);
+			if (FG(from_address)) {
+				php_stream_printf(stream TSRMLS_CC, "PASS %s\r\n", FG(from_address));
 			} else {
 				php_stream_write_string(stream, "PASS anonymous\r\n");
 			}