[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-172-g3839052
Marc Delisle
lem9 at users.sourceforge.net
Sun May 15 18:47:36 CEST 2011
The branch, master has been updated
via 38390524fe7fe487772c7ef5ab45731aa22a43be (commit)
via e5826013d7eb0138f3ca7f79c699ee6b00c0c997 (commit)
from 9ac8148754707d9c1533d21fada8ad183dd79f42 (commit)
- Log -----------------------------------------------------------------
commit 38390524fe7fe487772c7ef5ab45731aa22a43be
Merge: 9ac8148754707d9c1533d21fada8ad183dd79f42 e5826013d7eb0138f3ca7f79c699ee6b00c0c997
Author: Marc Delisle <marc at infomarc.info>
Date: Sun May 15 12:46:45 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
server_privileges.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server_privileges.php b/server_privileges.php
index 44adb0d..9636f64 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -16,6 +16,7 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$_add_user_error = false;
require './libraries/server_common.inc.php';
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list