The branch, master has been updated via e7daa97c32d3791f1d452bdd7e9806630eb5a807 (commit) via 19c0de6be237e3393b65b93ee4ef67ee3be68c18 (commit) via 987f943de33a0d0aa6ac3e3c352d48ac4a527a6d (commit) via f496bc9f1f9c241ac2d36167703539e73f909fe8 (commit) from 1816110fbf9f8bddafb12a8862fc67e536cc1dfa (commit)
- Log ----------------------------------------------------------------- commit e7daa97c32d3791f1d452bdd7e9806630eb5a807 Merge: f496bc9 19c0de6 Author: Michal Čihař mcihar@suse.cz Date: Mon Nov 7 15:47:56 2011 +0100
Merge remote-tracking branch 'origin/QA_3_4'
commit f496bc9f1f9c241ac2d36167703539e73f909fe8 Author: Michal Čihař mcihar@suse.cz Date: Mon Nov 7 15:13:56 2011 +0100
Better error message
-----------------------------------------------------------------------
Summary of changes: libraries/import/ods.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/libraries/import/ods.php b/libraries/import/ods.php index ab9729b..fc1c177 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);
hooks/post-receive