tobias/friendica
1
0
Fork 0
Code Pull requests Activity

parameters and getURLpath to getURLPath

Browse source
This commit is contained in:
Philipp Holzer 2018-10-10 01:18:47 +02:00
commit 307286fc47
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
12 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/App.php
View file

@ -673,7 +673,7 @@ class App
$this->hostname = Config::get('config', 'hostname');
}
return $scheme . '://' . $this->hostname . (!empty($this->getURLpath()) ? '/' . $this->getURLpath() : '' );
return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
}
/**
@ -727,7 +727,7 @@ class App
return $this->hostname;
}
public function getURLpath()
public function getURLPath()
{
return $this->urlpath;
}
@ -873,20 +873,20 @@ class App
/**
* @brief Removes the base url from an url. This avoids some mixed content problems.
*
* @param string $orig_url
* @param string $origURL
*
* @return string The cleaned url
*/
public function removeBaseURL($orig_url)
public function removeBaseURL($origURL)
{
// Remove the hostname from the url if it is an internal link
$nurl = normalise_link($orig_url);
$nurl = normalise_link($origURL);
$base = normalise_link($this->getBaseURL());
$url = str_replace($base . '/', '', $nurl);
// if it is an external link return the orignal value
if ($url == normalise_link($orig_url)) {
return $orig_url;
if ($url == normalise_link($origURL)) {
return $origURL;
} else {
return $url;
}