summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-01-26 17:52:57 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-01-26 17:53:06 +0000
commit24bd2cf5b991ea694eb7a85f81c7b6f021474e29 (patch)
treeec3efcb7d0dc971be3e34858957f8866b850c919
parentb397d455755f548caf5dc8e11baec0de7506ea3a (diff)
downloadwebtrees-24bd2cf5b991ea694eb7a85f81c7b6f021474e29.tar.gz
webtrees-24bd2cf5b991ea694eb7a85f81c7b6f021474e29.tar.bz2
webtrees-24bd2cf5b991ea694eb7a85f81c7b6f021474e29.zip
NULL == 0 error when sorting tabs/menus/sidebars
-rw-r--r--app/Module/ModuleMenuTrait.php2
-rw-r--r--app/Module/ModuleSidebarTrait.php2
-rw-r--r--app/Module/ModuleTabTrait.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/Module/ModuleMenuTrait.php b/app/Module/ModuleMenuTrait.php
index 10f65d8b7b..9b7d57a80f 100644
--- a/app/Module/ModuleMenuTrait.php
+++ b/app/Module/ModuleMenuTrait.php
@@ -44,7 +44,7 @@ trait ModuleMenuTrait
*/
public function getMenuOrder(): int
{
- return $this->menu_order ?: $this->defaultMenuOrder();
+ return $this->menu_order ?? $this->defaultMenuOrder();
}
/**
diff --git a/app/Module/ModuleSidebarTrait.php b/app/Module/ModuleSidebarTrait.php
index bf82d6cf67..74ec3af6d0 100644
--- a/app/Module/ModuleSidebarTrait.php
+++ b/app/Module/ModuleSidebarTrait.php
@@ -44,7 +44,7 @@ trait ModuleSidebarTrait
*/
public function getSidebarOrder(): int
{
- return $this->sidebar_order ?: $this->defaultSidebarOrder();
+ return $this->sidebar_order ?? $this->defaultSidebarOrder();
}
diff --git a/app/Module/ModuleTabTrait.php b/app/Module/ModuleTabTrait.php
index c3bd145059..910d321895 100644
--- a/app/Module/ModuleTabTrait.php
+++ b/app/Module/ModuleTabTrait.php
@@ -44,7 +44,7 @@ trait ModuleTabTrait
*/
public function getTabOrder(): int
{
- return $this->tab_order ?: $this->defaultTabOrder();
+ return $this->tab_order ?? $this->defaultTabOrder();
}
/**