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

Merge pull request #7044 from MrPetovan/task/router

Browse source 
Move mod/admin to src/Module/Admin
This commit is contained in:
Philipp 2019-05-02 18:26:30 +02:00 • committed by GitHub
commit 774d04cd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 3031 additions and 3894 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/App.php
View file

@ -405,8 +405,6 @@ class App
* @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN
*
* @return string Friendica server base URL
*
* @deprecated 2019.06 - use BaseURL->get($ssl) instead
*/
public function getBaseURL($ssl = false)
{
@ -508,7 +506,6 @@ class App
* being first
*/
$this->page['htmlhead'] = Core\Renderer::replaceMacros($tpl, [
'$baseurl' => $this->getBaseURL(),
'$local_user' => local_user(),
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
'$delitem' => Core\L10n::t('Delete this item?'),
@ -561,7 +558,6 @@ class App
$tpl = Core\Renderer::getMarkupTemplate('footer.tpl');
$this->page['footer'] = Core\Renderer::replaceMacros($tpl, [
'$baseurl' => $this->getBaseURL(),
'$footerScripts' => $this->footerScripts,
]) . $this->page['footer'];
}