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-29 20:40:13 +02:00
commit 184de4d4c3
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog
- bug #3390832 [display] Delete records from last page breaks search
- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken
- bug #3414744 [core] External link fails in 3.4.5
- patch #3314626 [display] CharTextareaRows is not respected
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd

6
server_privileges.php
View File

@ -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'

2
tbl_change.php
View File

@ -925,7 +925,7 @@ foreach ($rows as $row_id => $vrow) {
) {
echo "\n";
?>
<textarea name="fields<?php echo $field_name_appendix; ?>"
<textarea class="char" name="fields<?php echo $field_name_appendix; ?>"
rows="<?php echo $cfg['CharTextareaRows']; ?>"
cols="<?php echo $cfg['CharTextareaCols']; ?>"
dir="<?php echo $text_dir; ?>"

4
themes/original/css/theme_right.css.php
View File

@ -102,6 +102,10 @@ textarea {
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
}
textarea.char {
height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset {
margin-top: 1em;
border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;

3
themes/pmahomme/css/theme_right.css.php
View File

@ -205,6 +205,9 @@ textarea {
overflow: visible;
height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
}
textarea.char {
height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
}
fieldset {
margin-top: 1em;