Index: wikitools.module
===================================================================
--- wikitools.module	(revision 808)
+++ wikitools.module	(working copy)
@@ -107,7 +107,7 @@
     ),
     '#default_value' => wikitools_options(),
     '#description' => '<ul><li>'.
-      t('To take full advantage of the options <em>Node Creation</em>, <em>Node Search</em> and <em>Automatic Redirect</em> you should use an input format which creates wikilinks which point to the wiki path set. For exapmle a wikilink [[Page Name]] should be linked to <em>wikipath/Page Name</em>.') .'</li><li>'. 
+      t('To take full advantage of the options <em>Node Creation</em>, <em>Node Search</em> and <em>Automatic Redirect</em> you should use an input format which creates wikilinks which point to the wiki path set. For exapmle a wikilink [[Page Name]] should be linked to <em>wikipath/Page Name</em>.') .'</li><li>'.
       t('The options <em>Node Creation</em>, <em>Node Search</em> and <em>Automatic Redirect</em> work only if a wiki path is set or if freelinking hijacking is enabled. They take the page name from the path after the wiki path, i.e. <em>wikipath/Page Name</em>, or the page name of a freelinking link, i.e. <em>freelinking/Page Name</em>.') .'</li><li>'.
       t('The option <em>Automatic Redirect</em> works only if node revisions are created.') .'</li></ul>',
   );
@@ -222,9 +222,9 @@
 /**
  * What 404 error settings are set?
  */
-function wikitools_404($value = NULL) {
-  if (is_null($value)) {
-    return variable_get('wikitools_404_type', array('Link to search', 'Creation form'));
+function wikitools_404($values = NULL) {
+  if (is_null($values)) {
+    return variable_get('wikitools_404_type', array('Creation form' => 'Creation form'));
   }
   variable_set('wikitools_404_type', $values);
 }
@@ -699,13 +699,13 @@
 function theme_wikitools_page_does_not_exist($page_name) {
   $output = '<p>'. t('The page %page_name does not exist.', array('%page_name' => $page_name)) .'</p>';
   $settings = wikitools_404();
-  if (isset($settings['Link to search'])) {
+  if (in_array('Link to search', $settings) && $settings['Link to search']) {
     $output .= theme('wikitools_search_notice', $page_name);
   }
-  if (isset($settings['Link to creation'])) {
+  if (in_array('Link to creation', $settings) && $settings['Link to creation']) {
     $output .= theme('wikitools_create_notice', $page_name);
   }
-  if (isset($settings['Creation form'])) {
+  if (in_array('Creation form', $settings) && $settings['Creation form']) {
     $output .= theme('wikitools_create', $page_name);
   }
   return $output;