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

fix typo in preference name rt(e)_font*

Browse Source
This commit is contained in:
ralf 2022-05-23 12:48:30 +02:00
parent 9f363ad51c
commit 7a55eef6c8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Etemplate/Widget/HtmlArea.php
View File

@ -192,9 +192,9 @@ class HtmlArea extends Etemplate\Widget
*/
public static function contentCss()
{
$font_family = $GLOBALS['egw_info']['user']['preferences']['common']['rtf_font'] ?? 'arial, helvetica, sans-serif';
$font_size = ($GLOBALS['egw_info']['user']['preferences']['common']['rtf_font_size'] ?? '10').
($GLOBALS['egw_info']['user']['preferences']['common']['rtf_font_unit'] ?? 'pt');
$font_family = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'] ?? 'arial, helvetica, sans-serif';
$font_size = ($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'] ?? '10').
($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'] ?? 'pt');
return <<<EOF
/**

2
api/tinymce.php
View File

@ -28,7 +28,7 @@ $GLOBALS['egw']->session->commit_session();
// use an etag over user prefs and modification time of HtmlArea
$etag = '"'.md5(json_encode(array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'],
array_flip(['rtf_font', 'rtf_font_size', 'rtf_font_unit']))).filemtime(__DIR__.'/src/Etemplate/Widget/HtmlArea.php')).'"';
array_flip(['rte_font', 'rte_font_size', 'rte_font_unit']))).filemtime(__DIR__.'/src/Etemplate/Widget/HtmlArea.php')).'"';
// headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
Api\Session::cache_control(86400); // cache for 1 day