[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20514-g96bf96d

The branch, master has been updated via 96bf96d4221811432b4535b5812dbd9cb77f64b8 (commit) via 6c980106b7e49de3d94a2877ec4f23253d21ee0b (commit) from abe93510a28dd5286518d80f6ca9c4bd7c9b7983 (commit) - Log ----------------------------------------------------------------- commit 96bf96d4221811432b4535b5812dbd9cb77f64b8 Merge: abe9351 6c98010 Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: Thu Sep 29 12:48:03 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- 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 425a6be..5668311 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/tbl_change.php b/tbl_change.php index b64da6e..774d711 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -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; ?>" diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 55c5549..2e4410b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -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; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 293f119..b6c37d3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -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; hooks/post-receive -- phpMyAdmin