Move OC_Helper code to OCP\Util for linkToRemote

2 files changed, 5 insertions, 27 deletions

diff --git a/lib/private/helper.php b/lib/private/helper.php
index efbc6bda1db..bd69c13de50 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -54,32 +54,6 @@ class OC_Helper {
 	private static $templateManager;
 
 	/**
-	 * Creates an url for remote use
-	 * @param string $service id
-	 * @return string the url
-	 *
-	 * Returns a url to the given service.
-	 */
-	public static function linkToRemoteBase($service) {
-		return OC::$server->getURLGenerator()->linkTo('', 'remote.php') . '/' . $service;
-	}
-
-	/**
-	 * Creates an absolute url for remote use
-	 * @param string $service id
-	 * @param bool $add_slash
-	 * @return string the url
-	 *
-	 * Returns a absolute url to the given service.
-	 */
-	public static function linkToRemote($service, $add_slash = true) {
-		return OC::$server->getURLGenerator()->getAbsoluteURL(
-			self::linkToRemoteBase($service)
-				. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '')
-		);
-	}
-
-	/**
 	 * Creates an absolute url for public use
 	 * @param string $service id
 	 * @param bool $add_slash
diff --git a/lib/public/util.php b/lib/public/util.php
index 6f5016fa4a1..a9fe0e47de6 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -282,7 +282,11 @@ class Util {
 	 * @since 4.0.0
 	 */
 	public static function linkToRemote( $service ) {
-		return(\OC_Helper::linkToRemote( $service ));
+		$urlGenerator = \OC::$server->getURLGenerator();
+		$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+		return $urlGenerator->getAbsoluteURL(
+			$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+		);
 	}
 
 	/**