ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'multi-server' into storageareas

This commit is contained in:
Isaac Connor 2016-01-03 11:57:07 -05:00
parent b1205bcaa9 c639822d62
commit 33b8405e0d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/Server.php
View File

@ -34,7 +34,11 @@ class Server {
} }
public function Url() { public function Url() {
if ( $this->Id() ) {
return ZM_BASE_PROTOCOL . '://'. $this->Hostname(); return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
} else {
return ZM_BASE_PATH;
}
} }
public function Hostname() { public function Hostname() {
if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) { if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) {