From: Felipe Pena <felipe@php.net>
Date: Sun, 28 Dec 2008 20:16:48 +0000 (+0000)
Subject: - Unicodify (#46687)
X-Git-Tag: php-5.4.0alpha1~191^2~4724
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f74e97e3e367e896fe6d87c62b6eeaeb3e96845;p=php

- Unicodify (#46687)
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index ce9f7c2a24..65d1cc30ff 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2129,7 +2129,7 @@ PHP_FUNCTION(pathinfo)
 		if (zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void **) &element) == SUCCESS) {
 			RETVAL_ZVAL(*element, 1, 0);
 		} else {
-			ZVAL_EMPTY_STRING(return_value);
+			ZVAL_EMPTY_UNICODE(return_value);
 		}
 	}
 
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index d2d5b2b612..178fae7d08 100644
--- a/ext/standard/tests/file/pathinfo_variation2.phpt
+++ b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -122,7 +122,7 @@ unicode(%d) %s
 unicode(%d) %s
 
 --float .5--
-string(0) ""
+unicode(0) ""
 
 --empty array--
 Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
@@ -141,22 +141,22 @@ Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
 NULL
 
 --uppercase NULL--
-string(0) ""
+unicode(0) ""
 
 --lowercase null--
-string(0) ""
+unicode(0) ""
 
 --lowercase true--
 unicode(17) "/usr/include/arpa"
 
 --lowercase false--
-string(0) ""
+unicode(0) ""
 
 --uppercase TRUE--
 unicode(17) "/usr/include/arpa"
 
 --uppercase FALSE--
-string(0) ""
+unicode(0) ""
 
 --empty string DQ--
 Error: 2 - pathinfo() expects parameter 2 to be long, Unicode string given, %s(%d)
@@ -191,9 +191,9 @@ Error: 2 - pathinfo() expects parameter 2 to be long, object given, %s(%d)
 NULL
 
 --undefined var--
-string(0) ""
+unicode(0) ""
 
 --unset var--
-string(0) ""
+unicode(0) ""
 ===DONE===