cvs: /php4 ChangeLog /php4/ext/standard basic_functions.c

andrey Tue Jul 27 12:26:30 1999 EDT Modified files: /php4 ChangeLog /php4/ext/standard basic_functions.c Log: check for nKeyLength not arKey Index: php4/ChangeLog diff -u php4/ChangeLog:1.25 php4/ChangeLog:1.26 --- php4/ChangeLog:1.25 Tue Jul 27 12:19:10 1999 +++ php4/ChangeLog Tue Jul 27 12:26:29 1999 @@ -2,7 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 -- Fixed a bug that prevented uksort() from working correctly (Andrey) +- Fixed bugs in uksort() and ksort() sort ordering (Andrey) - Fixed a memory leak when using assignment-op operators with lvalue of type string. - Fixed a problem in inheritence from classes that are defined in include()d Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.57 php4/ext/standard/basic_functions.c:1.58 --- php4/ext/standard/basic_functions.c:1.57 Tue Jul 27 12:17:58 1999 +++ php4/ext/standard/basic_functions.c Tue Jul 27 12:26:30 1999 @@ -634,11 +634,11 @@ first = *((Bucket **) a); second = *((Bucket **) b); - if (first->arKey == NULL && second->arKey == NULL) { + if (first->nKeyLength == 0 && second->nKeyLength == 0) { return (first->h - second->h); - } else if (first->arKey == NULL) { + } else if (first->nKeyLength == 0) { return -1; - } else if (second->arKey == NULL) { + } else if (second->nKeyLength == 0) { return 1; } min = MIN(first->nKeyLength, second->nKeyLength);