Project

General

Profile

« Previous | Next » 

Revision 1161

Added by Dietmar over 14 years ago

new update FCKeditor to Version 2.6.5 Modulversion 2.9.1

View differences:

include.php
35 35
	// require_once('../../config.php');
36 36
	require_once(WB_PATH. '/framework/class.database.php');
37 37

  
38
	// work out default editor.css file for FCKEditor
38
	// work out default editor.css file for CKeditor
39 39
	if(file_exists(WB_PATH .'/templates/' .DEFAULT_TEMPLATE .'/editor.css')) {
40 40
		$fck_template_dir = DEFAULT_TEMPLATE;
41 41
	} else {
......
47 47
		$pageid = (int) $_GET["page_id"];
48 48

  
49 49
		// obtain template folder of current page from the database
50
		if(!isset($admin)) { 
51
			$database = new database(); 
50
		if(!isset($admin)) {
51
			$database = new database();
52 52
		}
53
		$query_page = "SELECT template FROM " .TABLE_PREFIX ."pages WHERE page_id =$pageid"; 
53
		$query_page = "SELECT template FROM " .TABLE_PREFIX ."pages WHERE page_id =$pageid";
54 54
		$pagetpl = $database->get_one($query_page);   // if empty, default template is used
55 55

  
56 56
		// check if a specific template is defined for current page
......
65 65
}
66 66

  
67 67
function show_wysiwyg_editor($name, $id, $content, $width, $height) {
68
	// create new FCKEditor instance
68
	// create new CKeditor instance
69 69
	require_once(WB_PATH.'/modules/fckeditor/fckeditor/fckeditor.php');
70 70
	$oFCKeditor = new FCKeditor($name);
71 71

  
......
99 99

  
100 100
	// custom templates can be defined via /wb_config/wb_fcktemplates.xml
101 101
	if(file_exists(WB_PATH .'/modules/fckeditor/wb_config/wb_fcktemplates.xml')) {
102
		$oFCKeditor->Config['TemplatesXmlPath'] = WB_URL.'/modules/fckeditor/wb_config/wb_fcktemplates.xml';
102
		$oFCKeditor->Config['TemplatesXmlPath'] = WB_URL.'/modules/FCKeditor/wb_config/wb_fcktemplates.xml';
103 103
	}
104 104

  
105 105
  // set required file connectors (overwrite settings which may be made in fckconfig.js or my_fckconfig.js)

Also available in: Unified diff