clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid

Browse Source 
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
This commit is contained in:
Hypolite Petovan
2019-01-12 02:23:01 -05:00
parent 1bdb3c916a
commit abf20368b0
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/Theme.php
View File

@@ -9,6 +9,7 @@ namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Model\Profile;
/**
* Some functions to handle themes
@@ -196,16 +197,11 @@ class Theme
$query_params = [];
// Workaround for iOS Safari not initially sending the cookie for static files
if ($a->mobileDetect->isIos() && $a->mobileDetect->isSafari()) {
$query_params['t'] = time();
$puid = Profile::getThemeUid($a);
if ($puid) {
$query_params['puid'] = $puid;
}
if ($a->profile_uid) {
$query_params['puid'] = $a->profile_uid;
}
if (file_exists('view/theme/' . $theme . '/style.php')) {
return 'view/theme/' . $theme . '/style.pcss' . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
}