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-09-02 08:59:52 +02:00
commit 68012b0ab4
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/indexes.js
View File

@ -609,7 +609,12 @@ AJAX.registerOnload('indexes.js', function () {
$anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
$.post(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
var params = {
'is_js_confirmed': 1,
'ajax_request': true,
'token' : PMA_commonParams.get('token')
};
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var $table_ref = $rows_to_hide.closest('table');

8
js/navigation.js
View File

@ -609,7 +609,8 @@ $(function () {
data: {
favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined')
? window.localStorage.favorite_tables
: ''
: '',
token: PMA_commonParams.get('token')
},
success: function (data) {
if (data.changes) {
@ -940,7 +941,8 @@ function PMA_ensureNaviSettings(selflink) {
if (!$('#pma_navigation_settings').length) {
var params = {
getNaviSettings: true
getNaviSettings: true,
token: PMA_commonParams.get('token')
};
var url = $('#pma_navigation').find('a.navigation_url').attr('href');
$.post(url, params, function (data) {
@ -1537,6 +1539,8 @@ PMA_fastFilter.filter.prototype.request = function () {
}
var url = $('#pma_navigation').find('a.navigation_url').attr('href');
var params = self.$this.find('> ul > li > form.fast_filter').first().serialize();
params.token = PMA_commonParams.get('token');
if (self.$this.find('> ul > li > form.fast_filter:first input[name=searchClause]').length === 0) {
var $input = $('#pma_navigation_tree').find('li.fast_filter.db_fast_filter input.searchClause');
if ($input.length && $input.val() != $input[0].defaultValue) {

11
view_create.php
View File

@ -72,9 +72,14 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
}
if (! empty($_REQUEST['view']['definer'])) {
$arr = explode('@', $_REQUEST['view']['definer']);
$sql_query .= $sep . 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
$sql_query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
if (strpos($_REQUEST['view']['definer'], '@') === FALSE) {
$sql_query .= $sep . 'DEFINER='
. PMA\libraries\Util::backquote($_REQUEST['view']['definer']);
} else {
$arr = explode('@', $_REQUEST['view']['definer']);
$sql_query .= $sep . 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
$sql_query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
}
}
if (isset($_REQUEST['view']['sql_security'])) {