Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8a9b0f30d3d83746967ef457cca641e014c32a5 https://github.com/phpmyadmin/phpmyadmin/commit/b8a9b0f30d3d83746967ef457cca... Author: osaid osaid.nasir@gmail.com Date: 2016-11-28 (Mon, 28 Nov 2016)

Changed paths: M libraries/Encoding.php M libraries/File.php M libraries/config/ConfigFile.php

Log Message: ----------- Share code for getting temporary directory

Changed Encoding.php and File.php.

Fixes #12514

Signed-off-by: Osaid osaid.nasir@gmail.com Signed-off-by: Michal Čihař michal@cihar.com

Commit: 84971eaf4f1b47a148e60a0042291e5ccb45ea3d https://github.com/phpmyadmin/phpmyadmin/commit/84971eaf4f1b47a148e60a004229... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)

Changed paths: M libraries/config/ConfigFile.php

Log Message: ----------- Make function static as it's called statically

Issue #12690, #12514

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef1f3b5cf7da...84971eaf4f1b