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

Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server

This commit is contained in:
Isaac Connor 2016-01-04 14:51:47 -05:00
parent 273ab6c5c6 f5db14d823
commit 6ae1597671
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/Server.php
View File

@ -37,7 +37,7 @@ class Server {
if ( $this->Id() ) { if ( $this->Id() ) {
return ZM_BASE_PROTOCOL . '://'. $this->Hostname(); return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
} else { } else {
return ZM_BASE_PATH; return '';
} }
} }
public function Hostname() { public function Hostname() {