Index: trunk/wb/admin/pages/intro.php
===================================================================
--- trunk/wb/admin/pages/intro.php (revision 68)
+++ trunk/wb/admin/pages/intro.php (revision 69)
@@ -39,33 +39,10 @@
}
if(!isset($_GET['wysiwyg']) OR $_GET['wysiwyg'] != 'no') {
- if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="htmlarea" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
-?>
-
-
-
-'.$content.'';
- }
-
-
+ if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
+ function show_wysiwyg_editor($name,$id,$content,$width,$height) {
+ echo '';
+ }
} else {
$id_list=array('content');
require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
Index: trunk/wb/admin/interface/header.html
===================================================================
--- trunk/wb/admin/interface/header.html (revision 68)
+++ trunk/wb/admin/interface/header.html (revision 69)
@@ -14,13 +14,8 @@
}
function confirm_link(message, url) {
if(confirm(message)) location.href = url;
-}
-function initEditor() {
-
-}
-
+}
-
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php (revision 68)
+++ trunk/wb/admin/settings/index.php (revision 69)
@@ -271,8 +271,8 @@
// Insert templates
$template->set_block('main_block', 'editor_list_block', 'editor_list');
-$file='htmlarea';
-$module_name='HTMLArea';
+$file='none';
+$module_name='None';
$template->set_var('FILE', $file);
$template->set_var('NAME', $module_name);
if((!defined('WYSIWYG_EDITOR') OR $file == WYSIWYG_EDITOR) ? $selected = ' selected' : $selected = '');
@@ -280,7 +280,7 @@
$template->parse('editor_list', 'editor_list_block', true);
if($handle = opendir(WB_PATH.'/modules/')) {
while (false !== ($file = readdir($handle))) {
- if($file != "." AND $file != ".." AND $file != "CVS" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) {
+ if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) {
include(WB_PATH."/modules/$file/info.php");
if ($module_type == 'WYSIWYG') {
$template->set_var('FILE', $file);
Index: trunk/wb/modules/wysiwyg/modify.php
===================================================================
--- trunk/wb/modules/wysiwyg/modify.php (revision 68)
+++ trunk/wb/modules/wysiwyg/modify.php (revision 69)
@@ -34,39 +34,10 @@
if(!isset($wysiwyg_editor_loaded)) {
$wysiwyg_editor_loaded=true;
- if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="htmlarea" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
-
- // Workout how many WYSIWYG sections are used on this page
- $query_wysiwyg_sections = $database->query("SELECT section_id,module FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg' ORDER BY position ASC");
- $num_wysiwyg_sections = $query_wysiwyg_sections->numRows();
-
- echo ''
- . ''
- . '';
+ if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
function show_wysiwyg_editor($name,$id,$content,$width,$height) {
echo '';
}
-
} else {
$id_list=array();
$query_wysiwyg = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'wysiwyg'");
@@ -81,6 +52,7 @@
}
?>
+