Bug fixes with URLs

concretecms · Jan 23, 2017 · 1841a87 · 1841a87 · KorvinSzanto · Jan 23, 2017
1 parent e7f09e9
commit 1841a87
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/concrete/controllers/panel/detail/page/location.php b/concrete/controllers/panel/detail/page/location.php
@@ -125,13 +125,15 @@ public function submit()
 
             if (is_array($pathArray)) {
                 foreach ($pathArray as $i => $path) {
-                    $p = new PagePath();
-                    $p->setPagePath($path);
-                    $p->setPageObject($this->page);
-                    if ($canonical == $i) {
-                        $p->setPagePathIsCanonical(true);
+                    if ($path) {
+                        $p = new PagePath();
+                        $p->setPagePath($path);
+                        $p->setPageObject($this->page);
+                        if ($canonical == $i) {
+                            $p->setPagePathIsCanonical(true);
+                        }
+                        \ORM::entityManager()->persist($p);
                     }
-                    \ORM::entityManager()->persist($p);
                 }
             }
 

diff --git a/concrete/src/Page/Page.php b/concrete/src/Page/Page.php
@@ -2636,6 +2636,9 @@ public function generatePagePath()
             } else {
                 $pathString = $this->computeCanonicalPagePath();
             }
+            if (!$pathString) {
+                return ''; // We are allowed to pass in a blank path in the event of the home page being scanned.
+            }
             // ensure that the path is unique
             $suffix = 0;
             $cID = ($this->getCollectionPointerOriginalID() > 0) ? $this->getCollectionPointerOriginalID() : $this->cID;