[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20515-g20f6ee8

[Madhura Jayaratne]

The branch, master has been updated
       via  20f6ee84d699e000367a9a0c7f975eb4373f708b (commit)
      from  96bf96d4221811432b4535b5812dbd9cb77f64b8 (commit)


- Log -----------------------------------------------------------------
commit 20f6ee84d699e000367a9a0c7f975eb4373f708b
Author: Madhura Jayaratne <madhura...@gmail.com>
Date:   Thu Sep 29 23:14:56 2011 +0530

    Syntax error using str_replace()

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

Summary of changes:
 server_privileges.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index c1a1d83..e8b598c 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1422,7 +1422,7 @@ if (isset($_REQUEST['flush_privileges'])) {
 /**
  * defines some standard links
  */
-$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" 
href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%')
+$link_edit = '<a class="edit_user_anchor ' . $conditional_class . '" 
href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
     . '&amp;username=%s'
     . '&amp;hostname=%s'
     . '&amp;dbname=%s'
@@ -1430,7 +1430,7 @@ $link_edit = '<a class="edit_user_anchor ' . 
$conditional_class . '" href="serve
     . PMA_getIcon('b_usredit.png', __('Edit Privileges'))
     . '</a>';
 
-$link_revoke = '<a href="server_privileges.php?' . 
str_replace($GLOBALS['url_query'], '%', '%%')
+$link_revoke = '<a href="server_privileges.php?' . str_replace('%', '%%', 
$GLOBALS['url_query'])
     . '&amp;username=%s'
     . '&amp;hostname=%s'
     . '&amp;dbname=%s'
@@ -1439,7 +1439,7 @@ $link_revoke = '<a href="server_privileges.php?' . 
str_replace($GLOBALS['url_que
     . PMA_getIcon('b_usrdrop.png', __('Revoke'))
     . '</a>';
 
-$link_export = '<a class="export_user_anchor ' . $conditional_class . '" 
href="server_privileges.php?' . str_replace($GLOBALS['url_query'], '%', '%%')
+$link_export = '<a class="export_user_anchor ' . $conditional_class . '" 
href="server_privileges.php?' . str_replace('%', '%%', $GLOBALS['url_query'])
     . '&amp;username=%s'
     . '&amp;hostname=%s'
     . '&amp;initial=%s'


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git