summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorSterling Hughes <sterling@php.net>2003-07-02 04:31:33 +0000
committerSterling Hughes <sterling@php.net>2003-07-02 04:31:33 +0000
commitc491b0a672326eb155703b35c270e660e52af83a (patch)
tree5a5bd159b25e6dcdc59cece441214f06f3901e4d /Zend/zend_builtin_functions.c
parentdc22926f494ad628690c2041f3daf21fa4ebd45c (diff)
downloadphp-git-c491b0a672326eb155703b35c270e660e52af83a.tar.gz
Fix bug #24445
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index e2fb5dd001..66faf45b74 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -557,15 +557,7 @@ ZEND_FUNCTION(get_parent_class)
}
if (Z_TYPE_PP(arg) == IS_OBJECT) {
-
- if (Z_OBJ_HT_PP(arg)->get_class_name
- && Z_OBJ_HT_PP(arg)->get_class_name(*arg, &name, &name_length, 1 TSRMLS_CC) == SUCCESS) {
- RETURN_STRINGL(name, name_length, 0);
- } else if (Z_OBJ_HT_PP(arg)->get_class_entry && (ce = zend_get_class_entry(*arg TSRMLS_CC))) {
- RETURN_STRINGL(ce->name, ce->name_length, 1);
- } else {
- RETURN_FALSE;
- }
+ ce = zend_get_class_entry(*arg TSRMLS_CC);
} else if (Z_TYPE_PP(arg) == IS_STRING) {
zend_class_entry **pce;