harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of more variables with dashes in the names - use underscore *except* in CSS. These were probably already here, but if you see any - please keep them out of PHP and MySQL where they sometimes get interpreted as a subtraction operation and are a bugger to find.

Browse Source
This commit is contained in:
friendica
2013-08-15 22:52:19 -07:00
parent fc0a9c78a9
commit a8dd7280b3
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@@ -1559,7 +1559,7 @@ function profile_load(&$a, $nickname, $profile = '') {
$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
$_SESSION['theme'] = $a->profile['channel_theme'];
$_SESSION['mobile-theme'] = $a->profile['channel_mobile_theme'];
$_SESSION['mobile_theme'] = $a->profile['channel_mobile_theme'];
/**
* load/reload current theme info
@@ -1964,8 +1964,8 @@ function current_theme(){
$is_mobile = $a->is_mobile || $a->is_tablet;
if($is_mobile) {
$system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : '');
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
$system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : '');
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme);
if($theme_name === '---') {
// user has selected to have the mobile theme be the same as the normal one