Fix alias rendering in PageTree

AlexejKossmann · Apr 8, 2020 · 78dfc42 · 78dfc42
1 parent d3abce3
commit 78dfc42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core-bundle/src/Resources/contao/widgets/PageSelector.php b/core-bundle/src/Resources/contao/widgets/PageSelector.php
@@ -391,7 +391,7 @@ protected function renderPagetree($id, $intMargin, $protectedPage=false, $blnNoR
 		// Add the current page
 		if (!empty($childs))
 		{
-			$return .= Image::getHtml($this->getPageStatusIcon($objPage), '', $folderAttribute) . ' <a href="' . Backend::addToUrl('pn=' . $objPage->id) . '" title="' . StringUtil::specialchars($objPage->title . ' (' . $objPage->alias . Config::get('urlSuffix') . ')') . '">' . (($objPage->type == 'root') ? '<strong>' : '') . $objPage->title . (($objPage->type == 'root') ? '</strong>' : '') . '</a></div> <div class="tl_right">';
+			$return .= Image::getHtml($this->getPageStatusIcon($objPage), '', $folderAttribute) . ' <a href="' . Backend::addToUrl('pn=' . $objPage->id) . '" title="' . StringUtil::specialchars($objPage->title . ' (' . $objPage->alias . ')') . '">' . (($objPage->type == 'root') ? '<strong>' : '') . $objPage->title . (($objPage->type == 'root') ? '</strong>' : '') . '</a></div> <div class="tl_right">';
 		}
 		else
 		{

diff --git a/core-bundle/src/Resources/contao/widgets/PageTree.php b/core-bundle/src/Resources/contao/widgets/PageTree.php
@@ -176,10 +176,11 @@ public function generate()
 
 			if ($objPages !== null)
 			{
-				while ($objPages->next())
+				foreach ($objPages as $objPage)
 				{
-					$arrSet[] = $objPages->id;
-					$arrValues[$objPages->id] = Image::getHtml($this->getPageStatusIcon($objPages)) . ' ' . $objPages->title . ' (' . $objPages->alias . Config::get('urlSuffix') . ')';
+					$objPage->loadDetails();
+					$arrSet[] = $objPage->id;
+					$arrValues[$objPage->id] = Image::getHtml($this->getPageStatusIcon($objPage)) . ' ' . $objPage->title . ' (' . ($objPage->languagePrefix ? ($objPage->languagePrefix . '/') : '') . $objPage->alias . $objPage->urlSuffix . ')';
 				}
 			}