Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -139,7 +139,8 @@ abstract class _PromoteAbstract extends \IPS\Patterns\ActiveRecord
|
||||
*/
|
||||
public function get_settings()
|
||||
{
|
||||
return array_merge( $this->defaultSettings, json_decode( $this->_data['settings'], TRUE ) );
|
||||
$settings = json_decode( $this->_data['settings'], TRUE );
|
||||
return ( $settings ? array_merge( $this->defaultSettings, $settings ) : $this->defaultSettings );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user