From e41f19969a882bb514090cc0a25694884ee9ffdd Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sat, 8 Sep 2012 10:22:22 +0530
Subject: [PATCH] bug #3553068 [import] Table import from XML file fails

---
 ChangeLog                | 1 +
 libraries/import/xml.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e00f982612..ab83367de3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - bug #3561224 [edit] cell edit date field with empty date fills in current date
 - bug #3559955 [edit] current_date from function drop down fails on update
 - bug #3562472 add support for Solaris and FreeBSD system load and memory display in server status
+- bug #3553068 [import] Table import from XML file fails
 
 3.5.2.2 (2012-08-12)
 - [security] Fixed XSS vulnerabilities, see PMASA-2012-4
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index 38c2054bff..7b002984a5 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -186,7 +186,7 @@ $data_present = false;
 /**
  * Only attempt to analyze/collect data if there is data present
  */
-if ($xml && @$xml->count()) {
+if ($xml && @count($xml->children())) {
     $data_present = true;
 
     /**