R55391 - /trunk/egroupware/api/src/Html.php

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55391

URL: http://svn.stylite.de/viewvc/egroupware?rev=55391&view=rev
Log:
fix typo causing old etemplate to fail when using ckeditor

Modified:
trunk/egroupware/api/src/Html.php

Modified: trunk/egroupware/api/src/Html.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html.php?rev=55391&r1=55390&r2=55391&view=diff

— trunk/egroupware/api/src/Html.php (original)
+++ trunk/egroupware/api/src/Html.php Tue Mar 15 14:33:03 2016
@@ -436,7 +436,7 @@

	// User preferences
	$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];

•   $font_size = Html\CkEditorConfing::font_size_from_prefs();
  

•   $font_size = Html\CkEditorConfig::font_size_from_prefs();
    $font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
    if (empty($font) && empty($font_size)) $font_span = '';
  

@@ -448,7 +448,7 @@

window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/"; egw_LAB.wait(function() { - CKEDITOR.replace("'.$_name.'", '.Html\CkEditorConfing::get_ckeditor_config($_mode, + CKEDITOR.replace("'.$_name.'", '.Html\CkEditorConfig::get_ckeditor_config($_mode, $pxheight, $expanded, $_start_path).'); CKEDITOR.addCss("body { margin: 5px; }"); CKEDITOR.instances["'.$_name.'"].on( ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 _______________________________________________ eGroupWare-cvs mailing list eGroupWare-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/egroupware-cvs