Merge remote-tracking branch 'origin/development' into development

Dolphiq · Jan 18, 2018 · 9d65a25 · 9d65a25
2 parents b26e284 + 5c2c368
commit 9d65a25
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/controllers/SitemapController.php b/src/controllers/SitemapController.php
@@ -82,10 +82,14 @@ public function actionIndex()
         $urlset->setAttribute('xmlns', 'http://www.sitemaps.org/schemas/sitemap/0.9');
         $dom->appendChild($urlset);
 
+        $siteurl = isset(Craft::$app->config->general)
+                && isset(Craft::$app->config->general->siteUrl)
+            ? Craft::$app->config->general->siteUrl
+            : null;
 
         foreach($this->_createEntrySectionQuery()->all() as $item) {
-
-            $loc = rtrim($item['baseurl'], '/ ') . '/' . ($item['uri'] === '__home__' ? '' : $item['uri']);
+            $baseurl = rtrim($siteurl ?: $item['baseurl'], '/') . '/';
+            $loc = $baseurl . ($item['uri'] === '__home__' ? '' : $item['uri']);
 
             $url = $dom->createElement('url');
             $urlset->appendChild($url);
@@ -98,8 +102,8 @@ public function actionIndex()
         }
 
         foreach($this->_createEntryCategoryQuery()->all() as $item) {
-
-            $loc = rtrim($item['baseurl'], '/ ') . '/' . ($item['uri'] === '__home__' ? '' : $item['uri']);
+            $baseurl = rtrim($siteurl ?: $item['baseurl'], '/') . '/';
+            $loc = $baseurl . ($item['uri'] === '__home__' ? '' : $item['uri']);
 
             $url = $dom->createElement('url');
             $urlset->appendChild($url);
@@ -163,4 +167,4 @@ private function _createEntryCategoryQuery(): Query
 
 }
 
-?>
+?>