From 5a3410ca86a04a4aa434caf0dfcbcd157cf945b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 2 Feb 2017 14:43:18 +0100
Subject: [PATCH] Fixed sorting of tables in relation view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                      | 1 +
 templates/table/relation/foreign_key_row.phtml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 04000dc9e4..ea59b0e763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
 - issue #12929 Undefined index warning with ssl_ca_paths
 - issue #12924 Do not show errors from OpenSSL cookie encryption/decryption
 - issue #12945 Fixed hint rendering on adding new user
+- issue #12941 Fixed sorting of tables in relation view
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index 67f6d836fb..210a8af303 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -66,6 +66,9 @@ if ($foreign_db) {
         }
     }
 }
+if ($GLOBALS['cfg']['NaturalOrder']) {
+    uksort($tables, 'strnatcasecmp');
+}
 ?>
 <tr>
     <!-- Drop key anchor -->