mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-25 07:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make Monitor::Server always return a Server object so we don't have to test for null

Browse Source
This commit is contained in:
Isaac Connor committed 2022-09-30 09:57:21 -04:00
1 parent caedd94f69
commit 2f295a2f55
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
web/includes/Monitor.php
+5 -1
View File
@@ -299,8 +299,12 @@ public static function getStatuses() {
public function Server() {
if (!property_exists($this, 'Server')) {
if ($this->ServerId())
if ($this->ServerId()) {
$this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'}));
if (!$this->{'Server'}) {
$this->{'Server'} = new Server();
}
}
if (!property_exists($this, 'Server')) {
$this->{'Server'} = new Server();
}