tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6427 from friendica/revert-6380-bug/5148-get-cookies-from-safari

Browse source 
Revert "Change stylesheet path name for mobile browsers"
This commit is contained in:
Hypolite Petovan 2019-01-11 20:42:55 -05:00 committed by GitHub
parent 3020b9cb06 ffcd9fb78d
commit fbf73ef3a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Core/Theme.php
View file

@ -6,7 +6,6 @@
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\System; use Friendica\Core\System;
@ -192,17 +191,12 @@ class Theme
*/ */
public static function getStylesheetPath($theme) public static function getStylesheetPath($theme)
{ {
$a = BaseObject::getApp(); $a = get_app();
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : ''); $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
if (file_exists('view/theme/' . $theme . '/style.php')) { if (file_exists('view/theme/' . $theme . '/style.php')) {
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.pcss' . $opts;
} }
}
return 'view/theme/' . $theme . '/style.css'; return 'view/theme/' . $theme . '/style.css';
} }