The branch, master has been updated via 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 (commit) from 45926a3a2dd93873ff942e98b2bebba5c3ab2bba (commit)

- Log ----------------------------------------------------------------- commit 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 Author: Michal Čihař mcihar@novell.com Date: Thu Mar 17 16:10:36 2011 +0100

bug#3212720 Show error message on error.

-----------------------------------------------------------------------

Summary of changes: libraries/import/ods.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/libraries/import/ods.php b/libraries/import/ods.php index c0db7af..4bf5200 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -74,7 +74,14 @@ $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT);

unset($buffer);

-$sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); +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')); + $error = TRUE; +} else { + $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); +}

$tables = array();

hooks/post-receive