From d6133c861cfdaa4ec6a6f5fbb3b2a9062ad4bc91 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Jul 2013 02:01:35 -0700 Subject: configurable theme precedence rules, and passing the page owner to the pcss theme settings. --- view/theme/redbasic/php/config.php | 3 ++- view/theme/redbasic/php/style.php | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'view/theme/redbasic/php') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 5917b1e36..4e7363362 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -23,7 +23,7 @@ function theme_content(&$a) { function theme_post(&$a) { if(!local_user()) { return; } - + if (isset($_POST['redbasic-settings-submit'])) { set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']); @@ -37,6 +37,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']); set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); } + } // We probably don't want these if we're having global settings, but we'll comment out for now, just in case diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index e42770d17..8643925d3 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -3,9 +3,11 @@ // the get_config bits, though this is untested. // We also need to eventually. Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like. - $uid = get_controlling_channel_id(); - load_pconfig($uid,'redbasic'); + $uid = get_theme_uid(); + + if($uid) + load_pconfig($uid,'redbasic'); $line_height = false; $redbasic_font_size = false; -- cgit v1.2.3