clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 02:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added empty string check (#15235)" (#15249)

Browse Source 
This reverts commit cbe2ba55ce.
This commit is contained in:
Tony Murray 2023-08-24 10:09:50 -05:00 committed by GitHub
parent 723600751c
commit cfc9aca6a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Device.php
View File

@ -180,15 +180,12 @@ class Device extends BaseModel
{
$hostname_is_ip = IP::isValid($this->hostname);
$return_value = SimpleTemplate::parse($this->display ?: \LibreNMS\Config::get('device_display_default', '{{ $hostname }}'), [
return SimpleTemplate::parse($this->display ?: \LibreNMS\Config::get('device_display_default', '{{ $hostname }}'), [
'hostname' => $this->hostname,
'sysName' => $this->sysName ?: $this->hostname,
'sysName_fallback' => $hostname_is_ip ? $this->sysName : $this->hostname,
'ip' => $this->overwrite_ip ?: ($hostname_is_ip ? $this->hostname : $this->ip),
]);
// in case the displayName is a string without any content, return hostname
return trim($return_value) ?: $this->hostname;
}
/**