gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-12-30 14:09:11 +01:00
commit 5bff4deabe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,8 +7,9 @@ phpMyAdmin - ChangeLog
+ rfe #1564 Improve action message on Tracking page
+ rfe #1566 Change value of "Number of rows:" when "Show all" is checked
+ rfe Focus console by clicking on white space
+ rfe 1507 Part 1: Cycle through console history with keyboard up/down arrows
+ rfe #1507 Part 1: Cycle through console history with keyboard up/down arrows
+ rfe #1579 Default to primary key when adding relation
+ rfe #1572 User prefs: Diff-friendly JSON for config
4.3.5.0 (not yet released)

2
prefs_manage.php
View File

@ -30,7 +30,7 @@ if (isset($_POST['submit_export'])
$filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
PMA_downloadHeader($filename, 'application/json');
$settings = PMA_loadUserprefs();
echo json_encode($settings['config_data']);
echo json_encode($settings['config_data'], JSON_PRETTY_PRINT);
exit;
} else if (isset($_POST['submit_get_json'])) {
$settings = PMA_loadUserprefs();