Changeset 862

Timestamp:

2012-03-29T05:22:46+02:00 (14 months ago)

Author:

moo

Message:

fix previous wrong change on is_autoglobal

File:

• trunk/xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -2631 +2631 @@
     xc_hash_value_t hv;
 
-    switch (Z_TYPE_P(name)) {
 #ifdef IS_UNICODE
-        case IS_UNICODE:
-#endif
-        case IS_STRING:
-            break;
-        default:
-#ifdef IS_UNICODE
-            convert_to_unicode(name);
+    convert_to_unicode(name);
 #else
-            convert_to_string(name);
-#endif
-    }
+    convert_to_string(name);
+#endif
+
 #ifdef IS_UNICODE
     xce->entry.name_type = name->type;
@@ -3147 +3140 @@
     zval *name;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) {
         return;
     }
+
+#ifdef IS_UNICODE
+    convert_to_unicode(name);
+#else
+    convert_to_string(name);
+#endif
 
     RETURN_BOOL(zend_u_hash_exists(CG(auto_globals), UG(unicode), Z_STRVAL_P(name), Z_STRLEN_P(name) + 1));