FIX Apply the same fix to other usage of absoluteURL()

This commit is contained in:
Ed Wilde 2024-10-17 12:04:03 +13:00
parent 4acfe9d1d8
commit 83cbb59c72

View File

@ -160,11 +160,11 @@ class XMLDataFormatter extends DataFormatter
$fieldName = $relName . 'ID'; $fieldName = $relName . 'ID';
if ($obj->$fieldName) { if ($obj->$fieldName) {
$href = Director::absoluteURL($this->config()->api_base . "$relClass/" . $obj->$fieldName); $href = Director::absoluteURL($this->config()->api_base . "$relClass/" . $obj->$fieldName . ".xml");
} else { } else {
$href = Director::absoluteURL($this->config()->api_base . "$className/$id/$relName"); $href = Director::absoluteURL($this->config()->api_base . "$className/$id/$relName" . ".xml");
} }
$xml .= "<$relName linktype=\"has_one\" href=\"$href.xml\" id=\"" . $obj->$fieldName $xml .= "<$relName linktype=\"has_one\" href=\"$href\" id=\"" . $obj->$fieldName
. "\"></$relName>\n"; . "\"></$relName>\n";
} }
@ -190,8 +190,8 @@ class XMLDataFormatter extends DataFormatter
$items = $obj->$relName(); $items = $obj->$relName();
if ($items) { if ($items) {
foreach ($items as $item) { foreach ($items as $item) {
$href = Director::absoluteURL($this->config()->api_base . "$relClass/$item->ID"); $href = Director::absoluteURL($this->config()->api_base . "$relClass/$item->ID" . ".xml");
$xml .= "<$relClass href=\"$href.xml\" id=\"{$item->ID}\"></$relClass>\n"; $xml .= "<$relClass href=\"$href\" id=\"{$item->ID}\"></$relClass>\n";
} }
} }
$xml .= "</$relName>\n"; $xml .= "</$relName>\n";
@ -221,8 +221,8 @@ class XMLDataFormatter extends DataFormatter
$items = $obj->$relName(); $items = $obj->$relName();
if ($items) { if ($items) {
foreach ($items as $item) { foreach ($items as $item) {
$href = Director::absoluteURL($this->config()->api_base . "$relClass/$item->ID"); $href = Director::absoluteURL($this->config()->api_base . "$relClass/$item->ID" . ".xml");
$xml .= "<$relClass href=\"$href.xml\" id=\"{$item->ID}\"></$relClass>\n"; $xml .= "<$relClass href=\"$href\" id=\"{$item->ID}\"></$relClass>\n";
} }
} }
$xml .= "</$relName>\n"; $xml .= "</$relName>\n";