Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 29ca1f78928c8c842cc3d145f12eec24ad0e0194 https://github.com/phpmyadmin/phpmyadmin/commit/29ca1f78928c8c842cc3d145f12e... Author: Jeff Chan jefftchan@gmail.com Date: 2014-02-11 (Tue, 11 Feb 2014)

Changed paths: M libraries/properties/options/OptionsPropertyGroup.class.php M test/classes/properties/options/PMA_OptionsPropertyGroup_test.php

Log Message: ----------- Use stable sort for removeProperty of OptionsPropertyGroup.

The original custom sort function is not stable, which causes different results on HHVM. It now uses the default array_diff function which is stable. Also updated an incorrect test.

Signed-off-by: Jeff Chan jefftchan@gmail.com

Commit: 2127ee0f3a22c39575904a846fe0b4043691e19a https://github.com/phpmyadmin/phpmyadmin/commit/2127ee0f3a22c39575904a846fe0... Author: Marc Delisle marc@infomarc.info Date: 2014-02-14 (Fri, 14 Feb 2014)

Changed paths: M libraries/properties/options/OptionsPropertyGroup.class.php M test/classes/properties/options/PMA_OptionsPropertyGroup_test.php

Log Message: ----------- Merge pull request #922 from jeffchan/remove-property-stable-sort

Use stable sort for OptionsPropertyGroup removeProperty.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f34603791a22...2127ee0f3a22