gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2016-01-15 05:39:07 +01:00
commit 123484ae72
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/tbl_zoom_plot_jqplot.js
View File

@ -128,7 +128,7 @@ AJAX.registerTeardown('tbl_zoom_plot_jqplot.js', function () {
$('#tableid_3').unbind('change');
$('#inputFormSubmitId').unbind('click');
$('#togglesearchformlink').unbind('click');
$(document).on('keydown', "#dataDisplay :input");
$(document).off('keydown', "#dataDisplay :input");
$('button.button-reset').unbind('click');
$('div#resizer').unbind('resizestop');
$('div#querychart').unbind('jqplotDataClick');

2
libraries/check_user_privileges.lib.php
View File

@ -38,7 +38,7 @@ function PMA_checkRequiredPrivilegesForAdjust(
$show_grants_str, "SELECT, INSERT, UPDATE, DELETE"
) !== false)
) {
if ($show_grants_dbname = '*'
if ($show_grants_dbname == '*'
&& $show_grants_tblname == '*'
) {
$GLOBALS['col_priv'] = true;