updated ctools, panels, date, diff

sites/all/modules/contrib/panels/panels/panels.install

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Test requirements for installation and running.
  */
@@ -81,7 +85,7 @@ function panels_schema_9() {
   );
 
   return $schema;
- }
+}
 
 function panels_schema_8() {
   $schema = panels_schema_7();
@@ -308,7 +312,7 @@ function panels_schema_3() {
     ),
     'primary key' => array('pid'),
     'indexes' => array(
-      'did_idx' => array('did')
+      'did_idx' => array('did'),
     ),
   );
 
@@ -445,9 +449,7 @@ function panels_update_7300() {
  */
 function panels_update_7301() {
   // Load the schema.
-
   // Due to a previous failure, the field may already exist:
-
   $schema = panels_schema_4();
   $table = 'panels_pane';
   $field = 'locks';
@@ -627,7 +629,7 @@ function panels_update_7306() {
   }
 
   if (!empty($page_manager_panels)) {
-    // Check panels displays that only have empty storage types
+    // Check panels displays that only have empty storage types.
     $result = db_query("SELECT pd.did FROM {panels_display} pd WHERE pd.did IN (:dids) AND storage_type = ''", array(':dids' => array_keys($page_manager_panels)));
     foreach ($result as $row) {
       db_update('panels_display')
@@ -652,28 +654,15 @@ function panels_update_7307() {
     db_create_table($table_name, $schema[$table_name]);
   }
 
-  // Read existing allowed settings and store them in a new table.
-  $variables = db_select('variable', 'v')
-    ->fields('v', array('name'))
-    ->condition('name', '%' . db_like('_allowed_types'), 'LIKE')
-    ->execute()
-    ->fetchCol();
-  foreach ($variables as $name) {
-    $module = str_replace('_allowed_types', '', $name);
-    $variable = variable_get($name);
-    foreach ($variable as $type => $allowed) {
-      $allowed = empty($allowed) ? 0 : 1;
-      db_merge('panels_allowed_types')
-        ->key(array('module' => $module, 'type' => $type))
-        ->fields(array(
-          'module' => $module,
-          'type' => $type,
-          'allowed' => $allowed,
-        ))
-        ->execute();
-    }
-    variable_del($name);
-  }
+  /*
+  The version of this update hook in release 3.8 included code that
+  converted storage of allowed_types configuration from variables to the new
+  table, and also deleted existing allowed_types configuration variables.
+  See https://www.drupal.org/node/2479879.
+
+  In order to prevent data loss on sites that had not yet updated to 3.8, the
+  conversion and variable-deletion code has been removed from this update hook.
+   */
 }
 
 /**