Commit 3d55569a authored by Morris Jobke's avatar Morris Jobke
Browse files

OC_Helper::makeURLAbsolute is not used anymore

parent 6a7dbf3c
......@@ -69,18 +69,6 @@ class OC_Helper {
);
}
/**
* Makes an $url absolute
* @param string $url the url
* @return string the absolute url
* @deprecated Use \OC::$server->getURLGenerator()->getAbsoluteURL($url)
*
* Returns a absolute url to the given app and file.
*/
public static function makeURLAbsolute($url) {
return OC::$server->getURLGenerator()->getAbsoluteURL($url);
}
/**
* Creates an url for remote use
* @param string $service id
......
......@@ -243,48 +243,6 @@ class Test_Helper extends \Test\TestCase {
// Url generator methods
/**
* @small
* test absolute URL construction
* @dataProvider provideDocRootURLs
*/
function testMakeAbsoluteURLDocRoot($url, $expectedResult) {
\OC::$WEBROOT = '';
$result = \OC_Helper::makeURLAbsolute($url);
$this->assertEquals($expectedResult, $result);
}
/**
* @small
* test absolute URL construction
* @dataProvider provideSubDirURLs
*/
function testMakeAbsoluteURLSubDir($url, $expectedResult) {
\OC::$WEBROOT = '/owncloud';
$result = \OC_Helper::makeURLAbsolute($url);
$this->assertEquals($expectedResult, $result);
}
public function provideDocRootURLs() {
return array(
array('index.php', 'http://localhost/index.php'),
array('/index.php', 'http://localhost/index.php'),
array('/apps/index.php', 'http://localhost/apps/index.php'),
array('apps/index.php', 'http://localhost/apps/index.php'),
);
}
public function provideSubDirURLs() {
return array(
array('index.php', 'http://localhost/owncloud/index.php'),
array('/index.php', 'http://localhost/owncloud/index.php'),
array('/apps/index.php', 'http://localhost/owncloud/apps/index.php'),
array('apps/index.php', 'http://localhost/owncloud/apps/index.php'),
);
}
/**
* @small
* test linkToAbsolute URL construction
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment