From 6c980106b7e49de3d94a2877ec4f23253d21ee0b Mon Sep 17 00:00:00 2001
From: "Hans Fr. Nordhaug" <hansfn@users.sourceforge.net>
Date: Thu, 29 Sep 2011 12:47:48 -0400
Subject: [PATCH] patch #3314626 [display] CharTextareaRows is not respected

---
 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 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f4ad09f08..d5cee34b4 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 22584db43..213d383db 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 8cd56eba8..0ef7f740c 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 64209ce75..fba2f23ff 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;