Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

libraries/config/messages.inc.php

@@ -14,6 +14,8 @@ if (!function_exists('__')) {
     die('Bad invocation!');
 }
 
+$strConfigAjaxEnable_desc = __('Improves efficiency of screen refresh');
+$strConfigAjaxEnable_name = __('Enable Ajax');
 $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth');
 $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server');
 $strConfigAllowThirdPartyFraming_desc = __('Enabling this allows a page located on a different domain to call phpMyAdmin inside a frame, and is a potential [strong]security hole[/strong] allowing cross-frame scripting attacks');

libraries/config/setup.forms.php

@@ -120,6 +120,7 @@ $forms['Features']['Developer'] = array(
     'Error_Handler/gather',
     'DBG/sql');
 $forms['Features']['Other_core_settings'] = array(
+    'AjaxEnable',
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',

libraries/config/user_preferences.forms.php

@@ -22,6 +22,7 @@
 
 $forms = array();
 $forms['Features']['General'] = array(
+    'AjaxEnable',
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',