[gh-181] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@901 20a16fea-79d4-4915-8869-1ea9d5ebf173

[gh-181] Merging from testing into staging
9b27cd4a · Tim Steiner · 9a8fb892 · 9b27cd4a
Commit 9b27cd4a authored 13 years ago by Tim Steiner
--- a/sites/all/modules/unl/unl_migration.php
+++ b/sites/all/modules/unl/unl_migration.php
@@ -576,6 +576,18 @@ class Unl_Migration_Tool
            $this->_log('The file at ' . $fullPath . ' has no valid maincontentarea. Using entire body.');
            $maincontentarea = $this->_get_text_between_tokens($html, '<body>', '</body>');
        }
+    
+        if (!$maincontentarea) {
+            // its possible the body tag has attributes.  Check for this and filter them out.
+            $maincontentarea = $this->_get_text_between_tokens($html, '<body', '</body>');
+            // As long as we find a closing bracket before the next opening bracket, its probably safe to assume the body tag is intact. 
+            if (strpos($maincontentarea, '>') < strpos($maincontentarea, '<')) {
+              $maincontentarea = trim(substr($maincontentarea, strpos($maincontentarea, '>') + 1));
+            // Otherwise, ignore it all. (Will be an issue if the body has no other tags, but how likely is this?)
+            } else {
+              $maincontentarea = '';
+            }
+        }
        
        if (!$maincontentarea) {
            $this->_log('The file at ' . $fullPath . ' has no valid body. Ignoring.');