Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c00fe2cbfda2c3881cac764e23815dd198ad22d2 https://github.com/phpmyadmin/phpmyadmin/commit/c00fe2cbfda2c3881cac764e2381... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M ChangeLog M libraries/rte/rte_list.lib.php Log Message: ----------- Fix listing routines for non privileged user We first need to check if we can read the definition before parsing it. Fixes #12310 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c3ae85b2e14e08b1ccb68ec33fce443297f67da9 https://github.com/phpmyadmin/phpmyadmin/commit/c3ae85b2e14e08b1ccb68ec33fce... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-17 (Fri, 17 Jun 2016) Changed paths: M ChangeLog M libraries/rte/rte_list.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eb942e68b934...c3ae85b2e14e