Version 5.0.6

This commit is contained in:
Neo committed 2025-12-19 18:55:49 -08:00
1 parent a3a4a9ccbd
commit b89858b2ff
1214 files changed
+92828 -14859

No files matched your search

@@ -905,7 +905,7 @@ class Databases extends Model implements Permissions
*/
public function get_template_form() : string
{
return $this->display_settings['form']['template'];
return $this->display_settings['form']['template'] ?? 'form';
}
/**
@@ -913,7 +913,7 @@ class Databases extends Model implements Permissions
*/
public function get_template_display() : string
{
return $this->display_settings['display']['template'];
return $this->display_settings['display']['template'] ?? 'display';
}
/**
@@ -921,7 +921,7 @@ class Databases extends Model implements Permissions
*/
public function get_template_listing() : string
{
return $this->display_settings['listing']['layout'] == 'custom' ? $this->display_settings['listing']['template'] : 'listing';
return ( $this->display_settings['listing']['layout'] == 'custom' and $this->display_settings['listing']['template'] ) ? $this->display_settings['listing']['template'] : 'listing';
}
/**
@@ -929,7 +929,7 @@ class Databases extends Model implements Permissions
*/
public function get_template_categories() : string
{
return $this->display_settings['categories']['layout'] == 'custom' ? $this->display_settings['categories']['template'] : 'category_index';
return ( $this->display_settings['categories']['layout'] == 'custom' and $this->display_settings['categories']['template'] ) ? $this->display_settings['categories']['template'] : 'category_index';
}
/**
@@ -939,7 +939,7 @@ class Databases extends Model implements Permissions
{
if( $this->display_settings['index']['type'] != 'categories' )
{
return $this->display_settings['index']['layout'] == 'custom' ? $this->display_settings['index']['template'] : 'category_articles';
return ( $this->display_settings['index']['layout'] == 'custom' and $this->display_settings['index']['template'] ) ? $this->display_settings['index']['template'] : 'category_articles';
}
return $this->template_categories;
@@ -1006,7 +1006,7 @@ class Databases extends Model implements Permissions
public function preLoadWords() : void
{
/* Skip this during installation / uninstallation as the words won't be loaded */
if ( !Dispatcher::hasInstance() or Dispatcher::i()->controllerLocation === 'setup' OR ( Dispatcher::i()->controllerLocation === 'admin' AND Dispatcher::i()->module->key === 'applications' ) )
if ( !Dispatcher::hasInstance() or Dispatcher::i()->controllerLocation === 'setup' OR ( Dispatcher::i()->controllerLocation === 'admin' and Dispatcher::i()->module and Dispatcher::i()->module->key === 'applications' ) )
{
$this->langLoaded = TRUE;
return;