From 65a72fbeeccaa30c083a0282057f3d1f4ac4db20 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 12 Mar 2011 07:22:05 -0500 Subject: [PATCH 1/4] 3.4.0-beta4 --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3c40382c6..1f2dd7152 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.0-beta4-dev - Documentation + phpMyAdmin 3.4.0-beta4 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index b7d632085..111ee20da 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.0-beta4-dev +Version 3.4.0-beta4 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0ba6d1a0e..96c002a3e 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.0-beta4-dev'); + $this->set('PMA_VERSION', '3.4.0-beta4'); /** * @deprecated */ From 09605e2d816117abe4da3cf47336bd692abb1726 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 12 Mar 2011 08:01:26 -0500 Subject: [PATCH 2/4] 3.4.0-rc1-dev --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 1f2dd7152..d912e9c15 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.0-beta4 - Documentation + phpMyAdmin 3.4.0-rc1-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 111ee20da..d848e1981 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.0-beta4 +Version 3.4.0-rc1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96c002a3e..e791e3135 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.0-beta4'); + $this->set('PMA_VERSION', '3.4.0-rc1-dev'); /** * @deprecated */ From 653cd113cd25693547b8493caf53089fbfd9a649 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 12 Mar 2011 18:52:14 +0530 Subject: [PATCH 3/4] For binary fields remove only the 'inline_edit' class. --- libraries/display_tbl.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d47e94df7..ca8ef620f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1325,9 +1325,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // TEXT fields type so we have to ensure it's really a BLOB $field_flags = PMA_DBI_field_flags($dt_result, $i); - // reset $class from $inline_edit_class to just 'data' - // as we can't edit binary data - $class = 'data'; + // remove 'inline_edit' from $class as we can't edit binary data. + $class = str_replace('inline_edit', '', $class); if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { From 93339354a2342a8ed19216829a6c5743b5a2256f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 12 Mar 2011 19:08:03 +0530 Subject: [PATCH 4/4] For geometry fields remove only the 'inline_edit' class. --- libraries/display_tbl.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ca8ef620f..ef9e3978d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1365,9 +1365,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // g e o m e t r y } elseif ($meta->type == 'geometry') { $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); - // reset $class from $inline_edit_class to 'data' - // as we can't edit geometry data - $class = 'data'; + + // remove 'inline_edit' from $class as we can't edit geometry data. + $class = str_replace('inline_edit', '', $class); $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $geometry_text); unset($geometry_text);