From b5eee99e5f8cf31b0063d03ddb5ac6f42cbfff29 Mon Sep 17 00:00:00 2001
From: Joseph McGuire <joseph.p.mcguire@googlemail.com>
Date: Mon, 28 Nov 2011 13:01:21 +0000
Subject: [PATCH] Replaced autoload's hook with references in the .info file. This solves a bug where enabling the Messaging modules via an update hook executed from Drush would fail to build the autoload registry [#1354616].

---
 messaging.info                       |    7 ++++++-
 messaging.module                     |   16 ----------------
 messaging_mail/messaging_mail.info   |    3 ++-
 messaging_mail/messaging_mail.module |    8 --------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/messaging.info b/messaging.info
index b9fb5c0..f050cb6 100644
--- a/messaging.info
+++ b/messaging.info
@@ -2,4 +2,9 @@ name = Messaging
 description = Messaging system. This is the base module for the Messaging Framework
 package = "Messaging"
 dependencies[] = autoload
-core = 6.x
\ No newline at end of file
+core = 6.x
+files[] = includes/messaging_object.class.inc
+files[] = includes/messaging_destination.class.inc
+files[] = includes/messaging_message.class.inc
+files[] = includes/messaging_method.class.inc
+files[] = includes/messaging_store.class.inc
diff --git a/messaging.module b/messaging.module
index de88ceb..86e88b1 100644
--- a/messaging.module
+++ b/messaging.module
@@ -33,22 +33,6 @@ define('MESSAGING_CACHE_LIMIT', variable_get('messaging_cache_limit', 1000));
 define('MESSAGING_DEFAULT_CRON_PERCENT', variable_get('messaging_default_cron_percent', 80));
 
 /**
- * Implementation of hook_autoload_info().
- */
-function messaging_autoload_info() {
-  return array(
-    'Messaging_User_Object' => array('file' => 'includes/messaging_object.class.inc'),
-    'Messaging_Object' => array('file' => 'includes/messaging_object.class.inc'),
-    'Messaging_Cached_Object' => array('file' => 'includes/messaging_object.class.inc'),
-    'Messaging_Destination' => array('file' => 'includes/messaging_destination.class.inc'),
-    'Messaging_Message' => array('file' => 'includes/messaging_message.class.inc'),
-    'Messaging_Send_Method' => array('file' => 'includes/messaging_method.class.inc'),
-    'Messaging_Store' => array('file' => 'includes/messaging_store.class.inc'),
-    'Messaging_None' => array('file' => 'includes/messaging_object.class.inc'),
-  ); 
-}
-
-/**
  * Implementation of hook_help().
  */
 function messaging_help($path, $arg) {
diff --git a/messaging_mail/messaging_mail.info b/messaging_mail/messaging_mail.info
index 5b870cd..fe3f96b 100644
--- a/messaging_mail/messaging_mail.info
+++ b/messaging_mail/messaging_mail.info
@@ -2,4 +2,5 @@ name = Simple Mail
 description = Mail Sending Method: Integration with Drupal mail API
 package = "Messaging"
 dependencies[] = messaging
-core = 6.x
\ No newline at end of file
+core = 6.x
+files[] = messaging_method_mail.class.inc
diff --git a/messaging_mail/messaging_mail.module b/messaging_mail/messaging_mail.module
index e67415b..17de1c7 100644
--- a/messaging_mail/messaging_mail.module
+++ b/messaging_mail/messaging_mail.module
@@ -7,14 +7,6 @@
  */
 
 /**
- * Implementation of hook_autoload_info().
- */
-function messaging_mail_autoload_info() {
-  return array(
-    'Messaging_Method_Mail' => array('file' => 'messaging_method_mail.class.inc'),
-  ); 
-}
-/**
  * Implementation of hook_menu()
  */
 function messaging_mail_menu() {
-- 
1.7.4.1