The branch, master has been updated
       via  47b5a2b2f4b8ed659c3bed3a206534957b78b60d (commit)
      from  87c7d027ac101b57a2d3c445155e05de0144c29e (commit)


- Log -----------------------------------------------------------------
commit 47b5a2b2f4b8ed659c3bed3a206534957b78b60d
Author: Madhura Jayaratne <[email protected]>
Date:   Thu Sep 15 23:00:02 2011 +0530

    bug #3410077 - User overview erroneously loaded into Ajax dialog

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

Summary of changes:
 js/server_privileges.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js
index 738d64b..d1d051d 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -364,7 +364,8 @@ $(document).ready(function() {
         var button_options = {};
         button_options[PMA_messages['strCancel']] = function() 
{$(this).dialog("close").remove();}
 
-        $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': 
true}, function(data) {
+        var token = $(this).parents('form').find('input[name="token"]').val();
+        $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': 
true, 'token': token}, function(data) {
             $('<div id="edit_user_dialog"></div>')
             .append(data)
             .dialog({


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop 
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops?   How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to