[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[55188] trunk/lib/ckeditor_tiki/wysiwyglib.php

[<wa...@us...>]

Revision: 55188
          http://sourceforge.net/p/tikiwiki/code/55188
Author:   walper
Date:     2015-04-23 14:39:52 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
[FIX] Fixed CKEDITOR regression introduced in r54912 from "MRG] Automatic merge, branches/14.x 54900 to 54911
Conflicts in lib/ckeditor_tiki/wysiwyglib.php fixed manually".
Note that the signature of of add_jsfile() in trunk is different than in 14.x. since the js handling is different.

Revision Links:
--------------
    http://sourceforge.net/p/tikiwiki/code/54912

Modified Paths:
--------------
    trunk/lib/ckeditor_tiki/wysiwyglib.php

Modified: trunk/lib/ckeditor_tiki/wysiwyglib.php
===================================================================
--- trunk/lib/ckeditor_tiki/wysiwyglib.php	2015-04-23 14:25:34 UTC (rev 55187)
+++ trunk/lib/ckeditor_tiki/wysiwyglib.php	2015-04-23 14:39:52 UTC (rev 55188)
@@ -118,7 +118,7 @@
 		$headerlib->add_js_config('window.CKEDITOR_BASEPATH = "'. $tikiroot . 'vendor/ckeditor/ckeditor/";')
 			//// for js debugging - copy _source from ckeditor distribution to libs/ckeditor to use
 			//// note, this breaks ajax page load via wikitopline edit icon
-			->add_jsfile('vendor/ckeditor/ckeditor/ckeditor.js', 0, true)
+			->add_jsfile('vendor/ckeditor/ckeditor/ckeditor.js', true)
 			->add_js('window.CKEDITOR.config._TikiRoot = "'.$tikiroot.'";', 1);
 
 		$headerlib->add_js(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.