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

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2013-02-09 07:50:16 -05:00
parent 4aa963ac87
commit bcfba0d46c
7 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -92,6 +92,7 @@ VerboseMultiSubmit, ReplaceHelpImg
3.5.7.0 (not yet released)
- bug #3779 [core] Problem with backslash in enum fields
- bug #3816 Missing server_processlist.php
3.5.6.0 (2013-01-28)
- bug #3593604 [status] Erroneous advisor rule

1
doc/config.rst
View File

@ -1711,7 +1711,6 @@ Tabs display settings
* ``server_status.php``
* ``server_variables.php``
* ``server_privileges.php``
* ``server_processlist.php``
.. config:option:: $cfg['DefaultTabDatabase']

2
libraries/ServerStatusData.class.php
View File

@ -228,8 +228,6 @@ class PMA_ServerStatusData
PMA_generate_common_url();
$links['qcache']['doc'] = 'query_cache';
//$links['threads'][__('Show processes')]
// = 'server_processlist.php?' . PMA_generate_common_url();
$links['threads']['doc'] = 'mysql_threads';
$links['key']['doc'] = 'myisam_key_cache';

1
libraries/common.inc.php
View File

@ -388,7 +388,6 @@ $goto_whitelist = array(
'server_export.php',
'server_import.php',
'server_privileges.php',
'server_processlist.php',
'server_sql.php',
'server_status.php',
'server_status_advisor.php',

1
libraries/config.default.php
View File

@ -1171,7 +1171,6 @@ $cfg['PropertiesNumColumns'] = 1;
* 'server_status.php' = runtime information
* 'server_variables.php' = MySQL server variables
* 'server_privileges.php' = user management
* 'server_processlist.php' = process list
*
* @global string $cfg['DefaultTabServer']
*/

3
libraries/config.values.php
View File

@ -75,8 +75,7 @@ $cfg_db['DefaultTabServer'] = array(
'server_databases.php', // list of databases
'server_status.php', // runtime information
'server_variables.php', // MySQL server variables
'server_privileges.php', // user management
'server_processlist.php' // process list
'server_privileges.php' // user management
);
$cfg_db['DefaultTabDatabase'] = array(
'db_structure.php', // tables list

5
test/theme.php
View File

@ -126,11 +126,6 @@ $tabs['binlog']['icon'] = 's_tbl.png';
$tabs['binlog']['link'] = 'server_binlog.php';
$tabs['binlog']['text'] = __('Binary log');
$tabs['process']['icon'] = 's_process.png';
$tabs['process']['link'] = 'server_processlist.php';
$tabs['process']['text'] = 'caution';
$tabs['process']['class'] = 'caution';
$tabs['export']['icon'] = 'b_export.png';
$tabs['export']['text'] = 'disabled';