holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved skin control, if skin is not chosen by user/default

Browse Source
This commit is contained in:
Klaus Leithoff 2010-05-27 10:06:40 +00:00
parent 8973b4c9b5
commit bc2f709a4d
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.html.inc.php
View File

@ -641,8 +641,6 @@ class html
} }
} }
if (isset($GLOBALS['egw_info']['user']['preferences']['common']['rte_skin']))
{
$skin = $GLOBALS['egw_info']['user']['preferences']['common']['rte_skin']; $skin = $GLOBALS['egw_info']['user']['preferences']['common']['rte_skin'];
//Convert old fckeditor skin names to new ones //Convert old fckeditor skin names to new ones
@ -660,11 +658,11 @@ class html
} }
//Check whether the skin actually exists, if not, switch to a default //Check whether the skin actually exists, if not, switch to a default
if (!(file_exists($basePath.'skins/'.$skin) || file_exists($skin))) if (!(file_exists($basePath.'skins/'.$skin) || file_exists($skin) || !empty($skin)))
$skin = "office2003"; $skin = "office2003";
$oCKeditor->config['skin'] = $skin; $oCKeditor->config['skin'] = $skin;
}
//$oCKeditor->config['spellchecker'] = 'SpellCheck'; //$oCKeditor->config['spellchecker'] = 'SpellCheck';