diff options
| author | friendica <info@friendica.com> | 2013-10-16 20:31:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-16 20:31:19 -0700 |
| commit | a104a7877b09e0c4963e30b1fd91e2fa6db9ac36 (patch) | |
| tree | 82b77875e6e6e0ab87f8a4d16c077606431b1200 | |
| parent | 06e1e6a1b66b90431b5acf1876a7d62c2d67938f (diff) | |
| parent | 90fc3c1caf647214a079bfa12f92373e514276cd (diff) | |
| download | volse-hubzilla-a104a7877b09e0c4963e30b1fd91e2fa6db9ac36.tar.gz volse-hubzilla-a104a7877b09e0c4963e30b1fd91e2fa6db9ac36.tar.bz2 volse-hubzilla-a104a7877b09e0c4963e30b1fd91e2fa6db9ac36.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | view/theme/redbasic/php/config.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index faf6c6f35..90bd109ad 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -39,7 +39,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $scheme_choices = array(); $scheme_choices["---"] = t("Default"); - $files = glob('view/theme/' . current_theme() . '/schema/*'); + $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { $f = basename($file, ".php"); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index b5d020937..3344fcb3a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,5 +1,4 @@ <?php - // Get the UID of the channel owner $uid = get_theme_uid(); @@ -29,14 +28,14 @@ // not --- like the mobile theme does instead. if (($schema) && ($schema != '---')) { - $schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php'; + $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; require_once ($schemefile); } // If we haven't got a schema, load the default. We shouldn't touch this - we // should leave it for admins to define for themselves. if (! $schema) { - if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) { - $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php'; + if(file_exists('view/theme/redbasic/schema/default.php')) { + $schemefile = 'view/theme/redbasic/schema/' . 'default.php'; require_once ($schemefile); } } @@ -97,8 +96,8 @@ // Apply the settings - if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { - $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + if(file_exists('view/theme/redbasic/css/style.css')) { + $x = file_get_contents('view/theme/redbasic/css/style.css'); $options = array ( '$nav_bg_1' => $nav_bg_1, |