diff -u htmlpurifier.module htmlpurifier.module
--- htmlpurifier.module	14 Jun 2010 03:08:34 -0000
+++ htmlpurifier.module	24 Jun 2010 16:12:23 -0000
@@ -73,7 +73,6 @@
     'settings callback' => '_htmlpurifier_settings',
     'default settings' => array(
       'htmlpurifier_help' => TRUE,
-      'htmlpurifier_config' => _htmlpurifier_get_config(),
     ),
     'tips callback' => '_htmlpurifier_filter_tips',
     // Since HTML Purifier implements its own caching layer, having filter
@@ -220,11 +219,11 @@
     // D6 version, which also treated this as a per-format setting and
     // therefore had the same limitation.
     $filters = $format ? filter_list_format($format) : array();
-    if (!empty($filters['htmlpurifier_advanced']->status)) {
-      $config_data = (array) $filters['htmlpurifier_advanced']->settings['htmlpurifier_config'];
+    if (!empty($filters['htmlpurifier_advanced']->status) && isset($filters['htmlpurifier_advanced']->settings['htmlpurifier_config'])) {
+      $config_data = $filters['htmlpurifier_advanced']->settings['htmlpurifier_config'];
     }
-    elseif (!empty($filters['htmlpurifier_basic']->status)) {
-      $config_data = (array) $filters['htmlpurifier_basic']->settings['htmlpurifier_config'];
+    elseif (!empty($filters['htmlpurifier_basic']->status) && isset($filters['htmlpurifier_basic']->settings['htmlpurifier_config'])) {
+      $config_data = $filters['htmlpurifier_basic']->settings['htmlpurifier_config'];
     }
     else {
       $config_data = FALSE;
@@ -332,7 +331,7 @@
         '<div class="form-item"><h3>' .
         $title .
         '</h3><div class="description">' .
-        t('Please click on a directive name for more information on what it does before enabling or changing anything!  Changes will not apply to old entries until you clear the cache (see the dashboard)') .
+        t('Please click on a directive name for more information on what it does before enabling or changing anything!  Changes will not apply to old entries until you clear the cache (see the <a href="@url">settings page</a>).', array('@url' => url('admin/config/content/htmlpurifier'))) .
         '</div></div>';
     
     $config = _htmlpurifier_get_config($format->format);