? autoload-547736.patch
Index: autoload.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/autoload/autoload.module,v
retrieving revision 1.1
diff -u -p -r1.1 autoload.module
--- autoload.module	3 Oct 2008 05:43:31 -0000	1.1
+++ autoload.module	16 Aug 2009 18:04:28 -0000
@@ -23,8 +23,25 @@ function autoload_class($class) {
   }
 
   if (!empty($lookup[$class])) {
-    require_once dirname($_SERVER['SCRIPT_FILENAME']) .'/'. $lookup[$class];
+    if (autoload_is_cli()) {
+      require $lookup[$class];
+    }
+    else {
+      require_once dirname($_SERVER['SCRIPT_FILENAME']) .'/'. $lookup[$class];
+    }
+  }
+}
+
+/**
+ * Check if PHP is being run as a CLI.
+ * This code is taken from Drush.
+ */
+function autoload_is_cli() {
+  if (php_sapi_name() == 'cgi') {
+    return (is_numeric($_SERVER['argc']) && $_SERVER['argc'] > 0);
   }
+
+  return (php_sapi_name() == 'cli');
 }
 
 /**
