nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug#3212720 Show error message on error.

Browse Source
This commit is contained in:
Michal Čihař
2011-03-17 16:10:36 +01:00
parent 45926a3a2d
commit 65e53a8bb8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/import/ods.php
View File

@@ -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();