Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aebd3e11d96cb9a853b53bbfedc36a19c97046a4 https://github.com/phpmyadmin/phpmyadmin/commit/aebd3e11d96cb9a853b53bbfedc3... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M libraries/Error.class.php Log Message: ----------- Use PATH_SEPARATOR instead of own one Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 387331ff34cde974633ee64b3e380c10cfdf7e47 https://github.com/phpmyadmin/phpmyadmin/commit/387331ff34cde974633ee64b3e38... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M libraries/Error.class.php Log Message: ----------- Do not fail getting filename with open_basedir limitations The realpath() can also return FALSE, handle it gracefully. Fixes #11953 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 4b493988e408e91a19448e44b9b68d2773f14d09 https://github.com/phpmyadmin/phpmyadmin/commit/4b493988e408e91a19448e44b9b6... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M libraries/Error.php Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: ebc8e28226d095c6013d270dc7ea11bd65e94b4c https://github.com/phpmyadmin/phpmyadmin/commit/ebc8e28226d095c6013d270dc7ea... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M ChangeLog M libraries/Error.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5391fead30d7...ebc8e28226d0