Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 23:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2019.01-rc' into bug/6334-escape-get-app

Browse source
This commit is contained in:
Hypolite Petovan 2019-01-06 16:38:48 -05:00 • committed by GitHub
commit e447375cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 136 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Core/Theme.php
View file

@ -6,6 +6,7 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\System;
@ -191,11 +192,16 @@ class Theme
*/
public static function getStylesheetPath($theme)
{
$a = \get_app();
$a = BaseObject::getApp();
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
if (file_exists('view/theme/' . $theme . '/style.php')) {
return 'view/theme/' . $theme . '/style.pcss' . $opts;
if ($a->is_mobile) {
// Workaround for iOS Safari not sending the cookie for static files
return 'view/theme/' . $theme . '/style' . $opts;
} else {
return 'view/theme/' . $theme . '/style.pcss' . $opts;
}
}
return 'view/theme/' . $theme . '/style.css';