Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'xdebug_2_2'

  • Loading branch information...
commit 6e2969b319c0aa6c512c25a7d21c951c1e56351a 2 parents ff94e4b + e95eb3e
Derick Rethans authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  xdebug_var.c
2  xdebug_var.c
@@ -923,7 +923,7 @@ static int object_item_add_zend_prop_to_merged_hash(zend_property_info *zpp XDEB
923 923 zend_class_entry *ce;
924 924
925 925 if ((zpp->flags & ZEND_ACC_STATIC) == 0) {
926   - return;
  926 + return 0;
927 927 }
928 928 merged = va_arg(args, HashTable*);
929 929 object_type = va_arg(args, int);

0 comments on commit 6e2969b

Please sign in to comment.
Something went wrong with that request. Please try again.