Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/friendica/red into zpull

Browse source
This commit is contained in:
friendica 2013-08-21 17:16:57 -07:00
commit 3fbf577638
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -1962,8 +1962,8 @@ function current_theme(){
if($is_mobile) {
if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) {
$system_theme = '';
$theme_name = '';
$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
}
else {
$system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : '');

6
mod/admin.php
View file

@ -365,11 +365,11 @@ function admin_page_site(&$a) {
if($files) {
foreach($files as $file) {
$f = basename($file);
$theme_name = ((file_exists($file . '/.experimental')) ? sprintf("%s - Experimental", $f) : $f);
if (file_exists($file . '/.mobile')) {
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - Experimental", $f) : $f);
if (file_exists($file . '/mobile')) {
$theme_choices_mobile[$f] = $theme_name;
}
if (file_exists($file . '/.accessibility')) {
if (file_exists($file . '/accessibility')) {
$theme_choices_accessibility[$f] = $theme_name;
}
$theme_choices[$f] = $theme_name;