[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1489-g0b7d8e5

[Marc Delisle]

The branch, master has been updated
       via  0b7d8e5bf44df5fa033399541f8982323ca99a7b (commit)
      from  dea96e2e5ad21df2dd1c456457d451e137747e27 (commit)


- Log -----------------------------------------------------------------
commit 0b7d8e5bf44df5fa033399541f8982323ca99a7b
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 29 15:04:08 2011 -0500

    Conditional Ajax parameter in setup

-----------------------------------------------------------------------

Summary of changes:
 libraries/config/messages.inc.php |    2 ++
 libraries/config/setup.forms.php  |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 654974d..560b1e5 100644
--- a/libraries/config/messages.inc.php
+++ b/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');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 79c8bb7..7783065 100644
--- a/libraries/config/setup.forms.php
+++ b/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',


hooks/post-receive
-- 
phpMyAdmin