[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-35-g6c98010
Marc Delisle
lem9 at users.sourceforge.net
Thu Sep 29 18:50:20 CEST 2011
The branch, QA_3_4 has been updated
via 6c980106b7e49de3d94a2877ec4f23253d21ee0b (commit)
from 55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_change.php | 2 +-
themes/original/css/theme_right.css.php | 4 ++++
themes/pmahomme/css/theme_right.css.php | 3 +++
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4ad09f..d5cee34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,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
diff --git a/tbl_change.php b/tbl_change.php
index 22584db..213d383 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -981,7 +981,7 @@ foreach ($rows as $row_id => $vrow) {
if ($field['is_char'] && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) {
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; ?>"
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 8cd56eb..0ef7f74 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -109,6 +109,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;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 64209ce..fba2f23 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -226,6 +226,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;
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list