]> granicus.if.org Git - php/commitdiff
fix build, revert faulty patch
authorAntony Dovgal <tony2001@php.net>
Mon, 8 Jun 2009 13:09:30 +0000 (13:09 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 8 Jun 2009 13:09:30 +0000 (13:09 +0000)
Zend/zend_builtin_functions.c

index 6091c42bb4775db3bfbb95ca550debc91c016422..90e46a3544953707583ae8022bbf8076415b3466 100644 (file)
@@ -461,7 +461,6 @@ ZEND_FUNCTION(define)
        zend_bool non_cs = 0;
        int case_sensitive = CONST_CS;
        zend_constant c;
-       char *p;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &name, &name_len, &val, &non_cs) == FAILURE) {
                return;
@@ -471,34 +470,6 @@ ZEND_FUNCTION(define)
                case_sensitive = 0;
        }
 
-       /* class constant, check if there is name and make sure class is valid & exists */
-       if ((p = zend_memnstr(name, "::", sizeof("::") - 1, name + name_len))) {
-               char *class_name;
-               int found;
-               zend_class_entry **ce;
-               ALLOCA_FLAG(use_heap)
-
-               if (p == (name + name_len - sizeof("::") + 1)) {
-                       zend_error(E_WARNING, "Class constant must have a name");
-                       RETURN_FALSE;
-               } else if (p == name) {
-                       zend_error(E_WARNING, "Missing class name");
-                       RETURN_FALSE;
-               }
-
-               class_name = do_alloca((p - name + 1), use_heap);
-               zend_str_tolower_copy(class_name, name, (p - name));
-
-               found = zend_hash_find(EG(class_table), class_name, p - name + 1, (void **) &ce);
-
-               if (found != SUCCESS) {
-                       zend_error(E_WARNING, "Class '%s' does not exists", class_name);
-                       free_alloca(class_name, use_heap);
-                       RETURN_FALSE;
-               }
-               free_alloca(class_name, use_heap);
-       }
-
 repeat:
        switch (Z_TYPE_P(val)) {
                case IS_LONG: