diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
| commit | 78cd1153f012f871935130325167759898f030ab (patch) | |
| tree | 685a5fe56663e6b6087aa4f28c8f09daf1e80546 /lib/public | |
| parent | b830b3e24b281204344e9162352c7034f0a67187 (diff) | |
| parent | f9cec1426fe639a5683e36b5fbdeb9149feacb19 (diff) | |
| download | nextcloud-server-78cd1153f012f871935130325167759898f030ab.tar.gz nextcloud-server-78cd1153f012f871935130325167759898f030ab.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/util.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index 75ca29f7129..9f6f6f32e1e 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -165,7 +165,7 @@ class Util { * reverse proxies */ public static function getServerHost() { - return(\OC_Helper::serverHost()); + return(\OC_Request::serverHost()); } /** @@ -175,7 +175,7 @@ class Util { * Returns the server protocol. It respects reverse proxy servers and load balancers */ public static function getServerProtocol() { - return(\OC_Helper::serverProtocol()); + return(\OC_Request::serverProtocol()); } /** |