Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 09:44:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename App->path to App->urlpath

Browse source
This commit is contained in:
Hypolite Petovan 2018-06-25 20:39:56 -04:00
parent 5fdff3d813
commit e952d6677b
10 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/App.php
View file

@ -551,7 +551,7 @@ class App
$this->hostname = Config::get('config', 'hostname');
}
return $scheme . '://' . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $scheme . '://' . $this->hostname . (!empty($this->urlpath) ? '/' . $this->urlpath : '' );
}
/**
@ -579,7 +579,7 @@ class App
$hostname .= ':' . $parsed['port'];
}
if (x($parsed, 'path')) {
$this->path = trim($parsed['path'], '\\/');
$this->urlpath = trim($parsed['path'], '\\/');
}
if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php')) {
@ -607,7 +607,7 @@ class App
public function get_path()
{
return $this->path;
return $this->urlpath;
}
public function set_pager_total($n)