diff options
| author | zottel <github@zottel.net> | 2014-02-28 08:16:56 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-28 08:16:56 +0100 |
| commit | 4bb8e294a10a11d964759026bb1e899ca3926984 (patch) | |
| tree | 48fec5a7c0af5bc929f94223a7175aa9b484de69 /view/theme/redbasic/php/style.php | |
| parent | f8b3f032a95ccc9b1730a532e7b9fe185f7db910 (diff) | |
| parent | 7cb295bbe627eab2546e859248eacd26da948ed9 (diff) | |
| download | volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.tar.gz volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.tar.bz2 volse-hubzilla-4bb8e294a10a11d964759026bb1e899ca3926984.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/help.php
Diffstat (limited to 'view/theme/redbasic/php/style.php')
| -rw-r--r-- | view/theme/redbasic/php/style.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 901d06af7..01e81eb53 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -37,10 +37,16 @@ if(! $a->install) { } -// Now load the scheme. If a value is changed above, we'll keep the settings -// If not, we'll keep those defined by the schema -// Setting $scheme to '' wasn't working for some reason, so we'll check it's -// not --- like the mobile theme does instead. + // Now load the scheme. If a value is changed above, we'll keep the settings + // If not, we'll keep those defined by the schema + // Setting $schema to '' wasn't working for some reason, so we'll check it's + // not --- like the mobile theme does instead. + + + // Allow layouts to over-ride the schema + + if($_REQUEST['schema']) + $schema = $_REQUEST['schema']; if (($schema) && ($schema != '---')) { // Check it exists, because this setting gets distributed to clones |