From: Anatol Belski <ab@php.net>
Date: Sat, 15 Nov 2014 12:12:25 +0000 (+0100)
Subject: joined identical conditional blocks
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~46^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b3b4fc94497f8e468821e1a3108916cc83c15cf;p=php

joined identical conditional blocks
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 5577194b0c..24be94f0d9 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1697,8 +1697,7 @@ ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func,
 				p->key = NULL;
 			}
 		}
-	}
-	if (renumber) {
+
 		ht->nNextFreeElement = i;
 	}
 	if (ht->u.flags & HASH_FLAG_PACKED) {