Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

ChangeLog

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 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

Documentation.html

@@ -1776,8 +1776,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Defines the tab displayed by default on server view. Possible
         values: &quot;main.php&quot; (recommended for multi-user setups),
         &quot;server_databases.php&quot;, &quot;server_status.php&quot;,
-        &quot;server_variables.php&quot;, &quot;server_privileges.php&quot;
-        or &quot;server_processlist.php&quot;.</dd>
+        &quot;server_variables.php&quot; or &quot;server_privileges.php&quot;.</dd>
 
     <dt id="cfg_DefaultTabDatabase">$cfg['DefaultTabDatabase'] string</dt>
     <dd>Defines the tab displayed by default on database view. Possible

libraries/common.inc.php

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

libraries/config.default.php

@@ -1139,7 +1139,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']
  */

libraries/config.values.php

@@ -54,8 +54,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
     'db_sql.php',         // SQL form

libraries/server_links.inc.php

@@ -50,10 +50,6 @@ if (!$GLOBALS['is_ajax_request']) {
     $tabs['status']['link'] = 'server_status.php';
     $tabs['status']['text'] = __('Status');
 
-    /*$tabs['process']['icon'] = 's_process.png';
-    $tabs['process']['link'] = 'server_processlist.php';
-    $tabs['process']['text'] = __('Processes');*/
-
     if ($is_superuser && !PMA_DRIZZLE) {
         $tabs['rights']['icon'] = 's_rights.png';
         $tabs['rights']['link'] = 'server_privileges.php';

server_status.php

@@ -637,8 +637,6 @@ $links['qcache'][__('Flush query cache')]
         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';

test/theme.php

@@ -123,11 +123,6 @@ $tabs['binlog']['icon'] = 'ic_s_tbl';
 $tabs['binlog']['link'] = 'server_binlog.php';
 $tabs['binlog']['text'] = __('Binary log');
 
-$tabs['process']['icon'] =  'ic_s_process';
-$tabs['process']['link'] = 'server_processlist.php';
-$tabs['process']['text'] = 'caution';
-$tabs['process']['class'] = 'caution';
-
 $tabs['export']['icon'] = 'ic_b_export';
 $tabs['export']['text'] = 'disabled';