From c639822d6289aa679f48ebe38f8333df78789afc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Sun, 3 Jan 2016 11:55:53 -0500
Subject: [PATCH] When Server is not set, us ZM_BASE_PATH

---
 web/includes/Server.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index d254227ca..4ef6710db 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -34,7 +34,11 @@ class Server {
 	}
 
 	public function Url() {
-		return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
+		if ( $this->Id() ) {
+			return ZM_BASE_PROTOCOL . '://'. $this->Hostname();
+		} else {
+			return ZM_BASE_PATH;
+		}
 	}
 	public function Hostname() {
 		if ( isset( $this->{'Hostname'} ) and ( $this->{'Hostname'} != '' ) ) {