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:
Pootle server 2011-09-15 20:40:20 +02:00
commit fd0eff54b7
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db_operations.php
View File

@ -357,7 +357,12 @@ if (!$is_information_schema) {
<?php echo PMA_generate_common_hidden_inputs($db); ?>
<fieldset>
<legend>
<?php echo PMA_getIcon('b_comment.png', __('Database comment: '), true); ?>
<?php
if ($cfg['PropertiesIconic']) {
echo '<img class="icon ic_b_comment" src="themes/dot.gif" alt="" />';
}
echo __('Database comment: ');
?>
</legend>
<input type="text" name="comment" class="textfield" size="30"
value="<?php

3
js/server_privileges.js
View File

@ -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({

2
libraries/tbl_select.lib.php
View File

@ -202,7 +202,7 @@ EOT;
if ($in_fbs) {
$edit_url = 'gis_data_editor.php?' . PMA_generate_common_url();
$edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true);
$edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'));
$str .= '<span class="open_search_gis_editor">';
$str .= PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank');
$str .= '</span>';

2
tbl_change.php
View File

@ -990,7 +990,7 @@ foreach ($rows as $row_id => $vrow) {
$_url_params = $_url_params + array('gis_data[gis_type]' => strtoupper($field['pma_type']));
}
$edit_url = 'gis_data_editor.php' . PMA_generate_common_url($_url_params);
$edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true);
$edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'));
echo('<span class="open_gis_editor">');
echo(PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank'));
echo('</span>');