ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set defaults for vars == ''

pull/2804/head
Isaac Connor 2020-01-10 16:42:41 -05:00
parent 6da998b0c0
commit 5ee0158735
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/includes/Object.php
View File

@ -291,11 +291,13 @@ Logger::Debug("$k => Have default for $v: ");
$this->set($new_values);
}
# Set defaults. Note that we only replace "" with null, not other values
# because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
foreach ( $this->defaults as $field => $default ) {
if ( (!array_key_exists($field, $this)) or empty($this->{$field}) ) {
if ( (!array_key_exists($field, $this)) or ($this->{$field} == '') ) {
if ( is_array($default) ) {
$this->{$field} = $default['default'];
} else {
} else if ( $default == null ) {
$this->{$field} = $default;
}
}