cvs: ZendEngine2(PHP_5_3) / zend_ini.c

scottmac		Mon Jul  7 21:50:56 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_ini.c 
  Log:
  Tweak last commit, should always return NULL when an entry doesn't exist.
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.18.2.15&r2=1.39.2.2.2.18.2.16&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.15 ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.16
--- ZendEngine2/zend_ini.c:1.39.2.2.2.18.2.15	Mon Jul  7 21:37:46 2008
+++ ZendEngine2/zend_ini.c	Mon Jul  7 21:50:56 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.15 2008/07/07 21:37:46 scottmac Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.18.2.16 2008/07/07 21:50:56 scottmac Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -382,12 +382,12 @@
 		} else {
 			return ini_entry->value;
 		}
-	} else if (exists) {
-		*exists = 0;
+	} else {
+		if (exists) {
+			*exists = 0;
+		}
 		return NULL;
 	}
-
-	return "";
 }
 /* }}} */
 



-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php