Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ae9006e9be518e5a739cb17d2543fdf7aacd572c https://github.com/phpmyadmin/phpmyadmin/commit/ae9006e9be518e5a739cb17d2543... Author: Michal Čihař <michal@cihar.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M doc/config.rst M doc/setup.rst M libraries/Config.php M libraries/Encoding.php M libraries/File.php M libraries/Template.php M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/plugins/import/ImportShp.php M libraries/vendor_config.php M scripts/generate-twig-cache Log Message: ----------- Use one temporary directory Share one directory for Twig cache, SHP import and file uploads. The code now also validates the cache directory and creates it on the fly, so it properly detects if the directory can not be used. Also the documentation has been improved to document securing this directory. Fixes #13225 Fixes #13226 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 69da96b3e1ea45b4923f26aa357238d74f89b69f https://github.com/phpmyadmin/phpmyadmin/commit/69da96b3e1ea45b4923f26aa3572... Author: Michal Čihař <michal@cihar.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M index.php Log Message: ----------- Show warning if twig cache can not be used Issue #13225 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 92a1e5a47bd0916d6e6836554f8ae8b3a41ef6b1 https://github.com/phpmyadmin/phpmyadmin/commit/92a1e5a47bd0916d6e6836554f8a... Author: Michal Čihař <michal@cihar.com> Date: 2017-05-05 (Fri, 05 May 2017) Changed paths: M doc/config.rst M doc/setup.rst M index.php M libraries/Config.php M libraries/Encoding.php M libraries/File.php M libraries/Template.php M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/plugins/import/ImportShp.php M libraries/vendor_config.php M scripts/generate-twig-cache Log Message: ----------- Merge pull request #13237 from nijel/tempdir Share TempDir for Twig and other uses Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dff57bb33ac9...92a1e5a47bd0