summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-07 22:56:34 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-05-07 22:56:34 +0200
commit10d291d6b3bf25794a8edaea6c867788b717eb15 (patch)
tree1b83402cd97b609d5afd719fb41e7650eb81e7fa /lib/public
parent40b823bc8be138057c0e03c7f52cde8231386cdd (diff)
parent4dbc2093c680bebaa42f230937be88a58984c5bd (diff)
downloadnextcloud-server-10d291d6b3bf25794a8edaea6c867788b717eb15.tar.gz
nextcloud-server-10d291d6b3bf25794a8edaea6c867788b717eb15.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/util.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/public/util.php b/lib/public/util.php
index 4068d73370d..f9f3759fe5b 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -130,6 +130,18 @@ class Util {
}
+ /**
+ * @brief Creates an absolute url for remote use
+ * @param $service id
+ * @returns the url
+ *
+ * Returns a absolute url to the given app and file.
+ */
+ public static function linkToRemote( $service ) {
+ return(\OC_Helper::linkToRemote( $service ));
+ }
+
+
/**
* @brief Creates an url
* @param $app app
@@ -150,7 +162,7 @@ class Util {
* reverse proxies
*/
public static function getServerHost() {
- return(\OC_Helper::severHost());
+ return(\OC_Helper::serverHost());
}
/**