oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-16 20:05:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

App::get_baseurl is now replaced with System::baseUrl

Browse source
This commit is contained in:
Michael 2017-08-26 07:32:10 +00:00
parent 3c24bed412
commit 5adfeb0bd5
134 changed files with 603 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/theme/frost/php/default.php
View file

@ -2,7 +2,7 @@
<html lang="<?php echo $lang; ?>">
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
<script>var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>

4
view/theme/frost/theme.php
View file

@ -24,8 +24,8 @@ function frost_content_loaded(App $a) {
// I could do this in style.php, but by having the CSS in a file the browser will cache it,
// making pages load faster
if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
//$a->page['htmlhead'] = str_replace('$stylesheet', App::get_baseurl() . '/view/theme/frost/login-style.css', $a->page['htmlhead']);
$a->theme['stylesheet'] = App::get_baseurl() . '/view/theme/frost/login-style.css';
//$a->page['htmlhead'] = str_replace('$stylesheet', System::baseUrl() . '/view/theme/frost/login-style.css', $a->page['htmlhead']);
$a->theme['stylesheet'] = System::baseUrl() . '/view/theme/frost/login-style.css';
}
if ( $a->module === 'login' ) {