Merge branch 'QA_4_7'

ChangeLog

@@ -84,6 +84,7 @@ phpMyAdmin - ChangeLog
 - issue #12345 Correctly show affected rows for LOAD DATA queries
 - issue #13010 Copy database: SQL error for copying PMADB metadata
 - issue #13002 Fixed OpenDocument exports
+- issue #13000 Align NULL values according to the column alignment
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

js/functions.js

@@ -2087,7 +2087,7 @@ function bindCodeMirrorToInlineEditor() {
 
 function catchKeypressesFromSqlInlineEdit(event) {
     // ctrl-enter is 10 in chrome and ie, but 13 in ff
-    if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10)) {
+    if ((event.ctrlKey || event.metaKey) && (event.keyCode == 13 || event.keyCode == 10)) {
         $("#sql_query_edit_save").trigger('click');
     }
 }

themes/original/css/common.css.php

@@ -307,7 +307,6 @@ th.condition {
  */
 td.null {
     font-style: italic;
-    text-align: <?php echo $right; ?>;
     color: #7d7d7d;
 }
 

themes/pmahomme/css/common.css.php

@@ -611,7 +611,6 @@ tr:last-child td.condition {
  */
 td.null {
     font-style: italic;
-    text-align: <?php echo $right; ?>;
     color: #7d7d7d;
 }