bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' 2019.12 into develop

Browse source
This commit is contained in:
Tobias Diekershoff 2019-12-23 20:03:47 +01:00
commit 00756737b5
66 changed files with 70843 additions and 67948 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Core/ACL.php
View file

@ -335,6 +335,10 @@ class ACL extends BaseObject
*/
public static function getFullSelectorHTML(Page $page, array $user = null, bool $for_federation = false, array $default_permissions = [])
{
if (empty($user['uid'])) {
return '';
}
$page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
$page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
$page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));

2
src/Core/System.php
View file

@ -41,7 +41,7 @@ class System extends BaseObject
* @return string The cleaned url
* @throws \Exception
*/
public static function removedBaseUrl($orig_url)
public static function removedBaseUrl(string $orig_url)
{
return self::getApp()->removeBaseURL($orig_url);
}