Merge pull request #2042 from Daniel-KM/fix/site_slug_false

Fixed routing when site-slug is boolean false.
omeka · Mar 29, 2023 · 5388907 · 5388907
2 parents 078653c + 36e9f2e
commit 5388907
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/application/src/Mvc/MvcListeners.php b/application/src/Mvc/MvcListeners.php
@@ -293,9 +293,7 @@ public function prepareAdmin(MvcEvent $event)
 
  $event->getViewModel()->setTemplate('layout/layout-admin');
 
- if ($routeMatch->getParam('__SITEADMIN__')
- && $routeMatch->getParam('site-slug')
- ) {
+ if ($routeMatch->getParam('__SITEADMIN__')) {
  $this->prepareSite($event);
  }
  }
@@ -388,6 +386,10 @@ protected function prepareSite(MvcEvent $event)
  $services = $event->getApplication()->getServiceManager();
  $siteSlug = $event->getRouteMatch()->getParam('site-slug');
 
+ if (!is_string($siteSlug) || !strlen($siteSlug)) {
+ return false;
+ }
+
  try {
  $site = $services->get('Omeka\ApiManager')
  ->read('sites', ['slug' => $siteSlug])->getContent();

diff --git a/application/src/Mvc/Status.php b/application/src/Mvc/Status.php
@@ -64,7 +64,7 @@ public function setIsInstalled($isInstalled)
  /**
  * Get the route match.
  *
- * @return Laminas\Router\Http\RouteMatch
+ * @return \Laminas\Router\Http\RouteMatch
  */
  public function getRouteMatch()
  {

diff --git a/application/src/View/Helper/CurrentSite.php b/application/src/View/Helper/CurrentSite.php
@@ -5,7 +5,7 @@
 use Laminas\View\Helper\AbstractHelper;
 
 /**
- * CView helper for getting the current site representation.
+ * View helper for getting the current site representation.
  */
 class CurrentSite extends AbstractHelper
 {