Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4f151204d28de51f27cd43d8cad525b76c336ac8 https://github.com/phpmyadmin/phpmyadmin/commit/4f151204d28de51f27cd43d8cad5... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M libraries/DatabaseInterface.php M templates/table/relation/foreign_key_row.phtml M templates/table/relation/internal_relational_row.phtml Log Message: ----------- Fix more tables where table sorting is not honored Issue #12941 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: f67ac81675bacc05fe7d5c071b5573b4462535e5 https://github.com/phpmyadmin/phpmyadmin/commit/f67ac81675bacc05fe7d5c071b55... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M templates/table/relation/internal_relational_row.phtml Log Message: ----------- Use getTables instead of contructing the list again We do not need any condition here as in native relations. Issue #12941 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 018fa7515608b015f56c38e8fb31f26988a0405a https://github.com/phpmyadmin/phpmyadmin/commit/018fa7515608b015f56c38e8fb31... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M libraries/DatabaseInterface.php M templates/table/relation/foreign_key_row.phtml M templates/table/relation/internal_relational_row.phtml Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b2afc36572c6...018fa7515608