Changeset 862 for trunk/xcache.c


Ignore:
Timestamp:
2012-03-29T05:22:46+02:00 (2 years ago)
Author:
moo
Message:

fix previous wrong change on is_autoglobal

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r861 r862  
    26312631    xc_hash_value_t hv; 
    26322632 
    2633     switch (Z_TYPE_P(name)) { 
    26342633#ifdef IS_UNICODE 
    2635         case IS_UNICODE: 
    2636 #endif 
    2637         case IS_STRING: 
    2638             break; 
    2639         default: 
    2640 #ifdef IS_UNICODE 
    2641             convert_to_unicode(name); 
     2634    convert_to_unicode(name); 
    26422635#else 
    2643             convert_to_string(name); 
    2644 #endif 
    2645     } 
     2636    convert_to_string(name); 
     2637#endif 
     2638 
    26462639#ifdef IS_UNICODE 
    26472640    xce->entry.name_type = name->type; 
     
    31473140    zval *name; 
    31483141 
    3149     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name) == FAILURE) { 
     3142    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) { 
    31503143        return; 
    31513144    } 
     3145 
     3146#ifdef IS_UNICODE 
     3147    convert_to_unicode(name); 
     3148#else 
     3149    convert_to_string(name); 
     3150#endif 
    31523151 
    31533152    RETURN_BOOL(zend_u_hash_exists(CG(auto_globals), UG(unicode), Z_STRVAL_P(name), Z_STRLEN_P(name) + 1)); 
Note: See TracChangeset for help on using the changeset viewer.