Version 5.0.0 beta 3

applications/cms/sources/Databases/Databases.php

@@ -866,15 +866,29 @@ class Databases extends Model implements Permissions
 	 */
 	public function get_display_settings() : array
 	{
-		return isset( $this->_data['display_settings'] ) ?
-			json_decode( $this->_data['display_settings'], true ) :
-			array(
-				'index' => [ 'type' => 'all', 'layout' => 'featured', 'template' => null ],
-				'categories' => [ 'layout' => 'table', 'template' => null ],
-				'listing' => [ 'layout' => 'table', 'template' => null ],
-				'display' => [ 'layout' => 'custom', 'template' => 'display' ],
-				'form' => [ 'layout' => 'custom', 'template' => 'form' ]
-			);
+		$return = [];
+		if( isset( $this->_data['display_settings'] ) and $this->_data['display_settings'] )
+		{
+			$return = json_decode( $this->_data['display_settings'], true );
+		}
+
+		$default = array(
+			'index' => [ 'type' => 'all', 'layout' => 'featured', 'template' => null ],
+			'categories' => [ 'layout' => 'table', 'template' => null ],
+			'listing' => [ 'layout' => 'table', 'template' => null ],
+			'display' => [ 'layout' => 'custom', 'template' => 'display' ],
+			'form' => [ 'layout' => 'custom', 'template' => 'form' ]
+		);;
+
+		foreach( $default as $k => $v )
+		{
+			if( !isset( $return[ $k ] ) )
+			{
+				$return[ $k ] = $v;
+			}
+		}
+
+		return $return;
 	}
 
 	/**