Skip to content

Commit

Permalink
Fix siteUrl detection of no passed slug
Browse files Browse the repository at this point in the history
Old check failed in corner cases like a slug of '0'
  • Loading branch information
zerocrates committed Feb 6, 2025
1 parent c5ddfd1 commit 68ca95b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion application/src/Api/Representation/ItemRepresentation.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function primaryMedia()

public function siteUrl($siteSlug = null, $canonical = false)
{
if (!$siteSlug) {
if ($siteSlug === null) {
$siteSlug = $this->getServiceLocator()->get('Application')
->getMvcEvent()->getRouteMatch()->getParam('site-slug');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function primaryMedia()

public function siteUrl($siteSlug = null, $canonical = false)
{
if (!$siteSlug) {
if ($siteSlug === null) {
$siteSlug = $this->getServiceLocator()->get('Application')
->getMvcEvent()->getRouteMatch()->getParam('site-slug');
}
Expand Down
2 changes: 1 addition & 1 deletion application/src/Api/Representation/MediaRepresentation.php
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ public function displayTitle($default = null, $lang = null)

public function siteUrl($siteSlug = null, $canonical = false)
{
if (!$siteSlug) {
if ($siteSlug === null) {
$siteSlug = $this->getServiceLocator()->get('Application')
->getMvcEvent()->getRouteMatch()->getParam('site-slug');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function modified()

public function siteUrl($siteSlug = null, $canonical = false)
{
if (!$siteSlug) {
if ($siteSlug === null) {
$siteSlug = $this->site()->slug();
}
$url = $this->getViewHelper('Url');
Expand Down
2 changes: 1 addition & 1 deletion application/src/Api/Representation/SiteRepresentation.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public function owner()

public function siteUrl($siteSlug = null, $canonical = false)
{
if (!$siteSlug) {
if ($siteSlug === null) {
$siteSlug = $this->slug();
}
$url = $this->getViewHelper('Url');
Expand Down

0 comments on commit 68ca95b

Please sign in to comment.