Merge pull request #67 from hissy/fix/63

Get pages by paths with site objects when importing additional pages into the existing sitemap

Author: aembler

src/Concrete/Backup/ContentImporter/ValueInspector/Item/BatchPageItem.php

@@ -20,13 +20,21 @@ public function getContentObject()
     {
 
         // First, does the passed path exist in the site? If so, we consider this solved
-        // This is handled by the parent class
-        $object = parent::getContentObject();
-        if ($object) {
-            return $object;
+        $cPath = $this->getReference();
+        $site = $this->batch->getSite();
+        if ($cPath == '/' || $cPath == '') {
+            if ($site) {
+                return $site->getSiteHomePageObject('ACTIVE');
+            } else {
+                return Page::getByID(Page::getHomePageID(), 'ACTIVE');
+            }
+        }
+
+        $c = Page::getByPath($cPath, 'ACTIVE', $site);
+        if (is_object($c) && !$c->isError()) {
+            return $c;
         }
 
-        $cPath = $this->getReference();
         $entityManager = \ORM::entityManager();
 
         // Now, let's check to see if the path matches the original path of a page in the batch