Merge branch 'QA_5_1'

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

Author: MauricioFauth

ChangeLog

@@ -38,6 +38,8 @@ phpMyAdmin - ChangeLog
 - issue #16744 Fixed "Uncaught TypeError: XMLWriter::writeAttribute()" on Designer SVG export
 - issue        Fixed an PHP undefined index notice on export
 - issue #14555 Fixed JavaScript error when auto completion is open (upgraded CodeMirror to 5.60.0)
+- issue #16647 Fixed preferences form not showing texts and not respecting TabsMode config
+- issue        Fixed escape_mysql_wildcards Twig filter
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type

libraries/classes/Twig/UtilExtension.php

@@ -163,7 +163,7 @@ public function getFilters()
             ),
             new TwigFilter(
                 'escape_mysql_wildcards',
-                'PhpMyAdmin\Util::convertBitDefaultValue'
+                'PhpMyAdmin\Util::escapeMysqlWildcards'
             ),
         ];
     }

templates/preferences/header.twig

@@ -15,37 +15,37 @@
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/features%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/features' ? ' active' }}">
-          {{ get_icon('b_tblops', 'Features'|trans) }}
+          {{ get_icon('b_tblops', 'Features'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/sql%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/sql' ? ' active' }}">
-          {{ get_icon('b_sql', 'SQL queries'|trans) }}
+          {{ get_icon('b_sql', 'SQL queries'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/navigation%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/navigation' ? ' active' }}">
-          {{ get_icon('b_select', 'Navigation panel'|trans) }}
+          {{ get_icon('b_select', 'Navigation panel'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/main-panel%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/main-panel' ? ' active' }}">
-          {{ get_icon('b_props', 'Main panel'|trans) }}
+          {{ get_icon('b_props', 'Main panel'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/export%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/export' ? ' active' }}">
-          {{ get_icon('b_export', 'Export'|trans) }}
+          {{ get_icon('b_export', 'Export'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
 
       <li class="nav-item">
         <a href="{{ url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E/preferences/import%3Cspan%20class=%22pl-pds%22%3E'%3C/span%3E%3C/span%3E) }}" class="nav-link{{ route == '/preferences/import' ? ' active' }}">
-          {{ get_icon('b_import', 'Import'|trans) }}
+          {{ get_icon('b_import', 'Import'|trans, false, false, 'TabsMode') }}
         </a>
       </li>
     </ul>