merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions

View file

@ -164,7 +164,7 @@
$content_font = $editor_config->content_font;
$content_font_size = $editor_config->content_font_size;
if($content_font || $content_font_size) {
$buff = '<style> .xe_content { ';
$buff = '<style type="text/css"> .xe_content { ';
if($content_font) $buff .= 'font-family:'.$content_font.';';
if($content_font_size) $buff .= 'font-size:'.$content_font_size.';';
$buff .= ' }</style>';