--- xapian.module.orig	2008-06-01 08:04:18.000000000 -0400
+++ xapian.module	2008-06-01 08:08:50.000000000 -0400
@@ -26,14 +26,15 @@
 }
 
 /**
- * Function to determine if xapian is available or not
+ * Attempt to include xapian.php.  If there are errors, Xapian is not
+ * available, otherwise it is available.
  *
  * @return bool
  */
 function xapian_available() {
-  static $available;
+  static $available = FALSE;
 
-  if (!($available === TRUE || $available === FALSE)) {
+  if ($available === FALSE) {
     $GLOBALS['xapian_include_error'] = NULL;
     set_error_handler('_xapian_requirements_error_handler');
     include_once('xapian.php');
@@ -42,9 +43,6 @@
     if (NULL == $GLOBALS['xapian_include_error']) {
       $available = TRUE;
     }
-    else {
-      $available = FALSE;
-    }
   }
   
   return $available;