From df76f57c63a000731cb84f828af66c43367ba69c Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Fri, 12 Sep 2008 20:18:33 +0000
Subject: [PATCH] #125267 by sun: Removed Safari browser warning configuration option.

---
 CHANGELOG.txt            |    1 +
 wysiwyg_editor.admin.inc |    9 ---------
 wysiwyg_editor.module    |    1 -
 3 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f583305..6f88c79 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-x.x, xxxx-xx-xx
 ---------------------------
+#125267 by sun: Removed Safari browser warning configuration option.
 #304243 by sun: Fixed profile configuration improperly passed to JavaScript.
 #304243 by sun: Code clean-up for wysiwyg_editor_profile_overview().
 #289218 by gustav: Fixed E^ALL notice if node has no body field.
diff --git a/wysiwyg_editor.admin.inc b/wysiwyg_editor.admin.inc
index 1742bad..aa2b084 100644
--- a/wysiwyg_editor.admin.inc
+++ b/wysiwyg_editor.admin.inc
@@ -65,7 +65,6 @@ function wysiwyg_editor_profile_form($form_state, $edit) {
       'show_toggle' => TRUE,
       'theme' => 'advanced',
       'language' => 'en',
-      'safari_message' => FALSE,
       'access' => 1,
       'access_pages' => "node/*\nuser/*\ncomment/*",
       'buttons' => array(),
@@ -159,14 +158,6 @@ function wysiwyg_editor_profile_form($form_state, $edit) {
     '#description' => t('The language for the Wysiwyg Editor interface. Language codes are based on the <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-2</a> format.'),
   );
 
-  $form['basic']['safari_message'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Safari browser warning'),
-    '#default_value' => $edit->settings['safari_message'],
-    '#return_value' => 1,
-    '#description' => t('TinyMCE support for the Safari web browser is experimental and a warning message is displayed when that browser is detected. You can disable this message here.'),
-  );
-
   $form['visibility'] = array(
     '#type' => 'fieldset',
     '#title' => t('Visibility'),
diff --git a/wysiwyg_editor.module b/wysiwyg_editor.module
index 18e709e..60d55bd 100644
--- a/wysiwyg_editor.module
+++ b/wysiwyg_editor.module
@@ -394,7 +394,6 @@ function wysiwyg_editor_config($profile, $theme) {
   $init['relative_urls'] = FALSE;
   $init['document_base_url'] = "$base_path";
   $init['language'] = $settings['language'] ? $settings['language'] : 'en';
-  $init['safari_warning'] = $settings['safari_message'] ? $settings['safari_message'] : FALSE;
   $init['entity_encoding'] = 'raw';
   $init['verify_html'] = $settings['verify_html'] ? $settings['verify_html'] : TRUE;
   $init['preformatted'] = $settings['preformatted'] ? $settings['preformatted'] : FALSE;
-- 
1.7.4.1