Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-08 14:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove duplicate $baseurl template variable

Browse source 
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
This commit is contained in:
Hypolite Petovan 2019-04-27 22:18:30 -04:00
parent d8125eb3db
commit 9774c95b80
41 changed files with 38 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Admin/Blocklist/Contact.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Module\Admin\Blocklist;
use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\BaseAdminModule;
use Friendica\Model;
@ -77,7 +76,7 @@ class Contact extends BaseAdminModule
'$form_security_token' => parent::getFormSecurityToken("admin_contactblock"),
// values //
'$baseurl' => System::baseUrl(true),
'$baseurl' => $a->getBaseURL(true),
'$contacts' => $contacts,
'$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total),
@ -86,4 +85,4 @@ class Contact extends BaseAdminModule
]);
return $o;
}
}
}

7
src/Module/Admin/Blocklist/Server.php
View file

@ -5,7 +5,6 @@ namespace Friendica\Module\Admin\Blocklist;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -55,6 +54,8 @@ class Server extends BaseAdminModule
{
parent::content();
$a = self::getApp();
$blocklist = Config::get('system', 'blocklist');
$blocklistform = [];
if (is_array($blocklist)) {
@ -83,9 +84,9 @@ class Server extends BaseAdminModule
'$threason' => L10n::t('Reason for the block'),
'$delentry' => L10n::t('Delete entry from blocklist'),
'$entries' => $blocklistform,
'$baseurl' => System::baseUrl(true),
'$baseurl' => $a->getBaseURL(true),
'$confirm_delete' => L10n::t('Delete entry from blocklist?'),
'$form_security_token' => parent::getFormSecurityToken("admin_blocklist")
]);
}
}
}