From f496bc9f1f9c241ac2d36167703539e73f909fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 7 Nov 2011 15:13:56 +0100 Subject: [PATCH 1/3] Better error message --- libraries/import/ods.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/import/ods.php b/libraries/import/ods.php index ab9729b5f2..fc1c1778c4 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -73,8 +73,7 @@ unset($buffer); if ($xml === false) { $sheets = array(); - /* TODO: this message should be improved later, used existing because of string freeze */ - $message = PMA_Message::error(__('Error in Processing Request')); + $message = PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.')); $error = true; } else { $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); From 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 7 Nov 2011 15:46:43 +0100 Subject: [PATCH 2/3] Add missing release date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 04455a7da1..1e06756fc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.7.0 (not yet released) +3.4.7.0 (2011-10-23) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing - bug [view] View renaming did not work From cc2fe91e767d2c38855f1bb866d71c4a721b82cd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 7 Nov 2011 09:54:21 -0500 Subject: [PATCH 3/3] Less intense vertical border for data --- themes/pmahomme/css/theme_right.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 048791a2eb..08f8ca5099 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -68,7 +68,7 @@ margin: 0 0 12px 0; } #table_results td.data { -border-right: 1px solid #444444; +border-right: 1px solid #BBBBBB; } h3 {