strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move PConfig::load() to DI::pConfig()->load()

Browse source
This commit is contained in:
Philipp Holzer 2020-01-18 15:59:01 +01:00
parent 71181704d4
commit 6e2880c679
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Core/PConfig.php
View file

@ -19,19 +19,6 @@ use Friendica\DI;
*/ */
class PConfig class PConfig
{ {
/**
* @brief Loads all configuration values of a user's config family into a cached storage.
*
* @param int $uid The user_id
* @param string $cat The category of the configuration value
*
* @return void
*/
public static function load(int $uid, string $cat)
{
DI::pConfig()->load($uid, $cat);
}
/** /**
* @brief Get a particular user's config variable given the category name * @brief Get a particular user's config variable given the category name
* ($cat) and a key. * ($cat) and a key.

3
view/theme/frio/style.php
View file

@ -5,6 +5,7 @@
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\DI;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'view/theme/frio/php/PHPColors/Color.php'; require_once 'view/theme/frio/php/PHPColors/Color.php';
@ -37,7 +38,7 @@ $login_bg_color = $login_bg_color ?: '#ededed';
// Get the UID of the profile owner. // Get the UID of the profile owner.
$uid = $_REQUEST['puid'] ?? 0; $uid = $_REQUEST['puid'] ?? 0;
if ($uid) { if ($uid) {
PConfig::load($uid, 'frio'); DI::pConfig()->load($uid, 'frio');
// Only override display settings that have actually been set // Only override display settings that have actually been set
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')) ?: $scheme; $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema')) ?: $scheme;