Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Revert bogus patch 

One must *never* use E_CORE_* error levels!
PEAR_1_4DEV
Zeev Suraski 23 years ago
parent
dcd0b8fc90
commit
93f0ee5fda
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Zend/zend_compile.c

6
Zend/zend_compile.c
View File

@ -1790,10 +1790,10 @@ void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce)
{
if ((ce->ce_flags & ZEND_ACC_INTERFACE)
&& !(parent_ce->ce_flags & ZEND_ACC_INTERFACE)) {
zend_error(E_CORE_ERROR, "Interface %s may not inherit from class (%s)", ce->name, parent_ce->name);
zend_error(E_COMPILE_ERROR, "Interface %s may not inherit from class (%s)", ce->name, parent_ce->name);
}
if (parent_ce->ce_flags & ZEND_ACC_FINAL_CLASS) {
zend_error(E_CORE_ERROR, "Class %s may not inherit from final class (%s)", ce->name, parent_ce->name);
zend_error(E_COMPILE_ERROR, "Class %s may not inherit from final class (%s)", ce->name, parent_ce->name);
}
ce->parent = parent_ce;
@ -1831,7 +1831,7 @@ ZEND_API int do_bind_function(zend_op *opline, HashTable *function_table, HashTa
zend_hash_find(function_table, opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len, (void *) &function);
if (zend_hash_add(function_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, function, sizeof(zend_function), NULL)==FAILURE) {
int error_level = compile_time ? E_COMPILE_ERROR : E_CORE_ERROR;
int error_level = compile_time ? E_COMPILE_ERROR : E_ERROR;
zend_function *function;
if (zend_hash_find(function_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void *) &function)==SUCCESS

Write Preview
Loading…
Cancel
Save