1 files changed, 24 insertions, 0 deletions
diff --git a/modules/update/update.install b/modules/update/update.install
index 99d9cfa75..520d73a31 100644
--- a/modules/update/update.install
+++ b/modules/update/update.install
@@ -7,6 +7,8 @@
 function update_install() {
   // Create cache table.
   drupal_install_schema('update');
+  // Remove stale variables from update_status 5.x contrib, if any.
+  _update_remove_update_status_variables();
 }
 
 /**
@@ -38,3 +40,25 @@ function update_schema() {
   return $schema;
 }
 
+/**
+ * Private helper to clear out stale variables from update_status 5.x contrib. 
+ *
+ * @see update_install()
+ * @see update_update_6000()
+ */
+function _update_remove_update_status_variables() {
+  variable_del('update_status_settings');
+  variable_del('update_status_notify_emails');
+  variable_del('update_status_check_frequency');
+  variable_del('update_status_notification_threshold');
+  variable_del('update_status_last');
+  variable_del('update_status_fetch_url');
+}
+
+/**
+ * Clear out stale variables from update_status.
+ */
+function update_update_6000() {
+  _update_remove_update_status_variables();
+  return array();
+}