Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 896fe8169a9a920fcd8797494ff2a16a4415411d https://github.com/phpmyadmin/phpmyadmin/commit/896fe8169a9a920fcd8797494ff2... Author: Jeff Chan jefftchan@gmail.com Date: 2014-02-16 (Sun, 16 Feb 2014)

Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_array_test.php

Log Message: ----------- Fix PMA_arrayWalkRecursive to ensure single pass thru keys

Fix a bug with PMA_arrayWalkRecursive that causes it to apply a function to its keys/values more than once. A previously incorrect test is fixed as well.

The bug happens because when keys are modified, PHP's foreach loops through the new keys again. This does not usually happen unless the iterating array is passed through by reference (or has refcount=1). See: http://stackoverflow.com/a/14854568/791890

Please see #936 for full explanation.

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

Commit: 938ba599a59664057346f262ddeff77e1f8a1c84 https://github.com/phpmyadmin/phpmyadmin/commit/938ba599a59664057346f262ddef... Author: Michal Čihař michal@cihar.com Date: 2014-02-17 (Mon, 17 Feb 2014)

Changed paths: M libraries/core.lib.php M test/libraries/core/PMA_array_test.php

Log Message: ----------- Merge pull request #943 from jeffchan/fix-arraywalk

Fix PMA_arrayWalkRecursive to ensure single pass thru keys

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d20f0fee787c...938ba599a596