Convert object cache to a BIG text field. Basically the same change as...

Convert object cache to a BIG text field. Basically the same change as webchick made to Views for me. Thanks webchick!

ctools.install

@@ -59,6 +59,7 @@ function ctools_schema_1() {
       ),
       'data' => array(
         'type' => 'blob',
+        'size' => 'big',
         'description' => t('Serialized data being stored.'),
         'serialize' => TRUE,
       ),

includes/object-cache.inc

@@ -36,7 +36,7 @@ function ctools_object_cache_get($obj, $name, $skip_cache = FALSE) {
   if (!array_key_exists($key, $cache)) {
     $data = db_fetch_object(db_query("SELECT * FROM {ctools_object_cache} WHERE sid = '%s' AND obj = '%s' AND name = '%s'", session_id(), $obj, $name));
     if ($data) {
-      $cache[$key] = unserialize(db_decode_blob($data->data));
+      $cache[$key] = unserialize($data->data);
     }
   }
   return isset($cache[$key]) ? $cache[$key] : NULL;

plugins/arguments/nid.inc

@@ -16,9 +16,6 @@ function ctools_nid_ctools_arguments() {
     'keyword' => 'node',
     'description' => t('Creates a node context from a node ID argument.'),
     'context' => 'ctools_argument_nid_context',
-    'criteria form' => 'ctools_argument_nid_criteria_form',
-    'criteria select' => 'ctools_argument_nid_criteria_select',
-    'criteria summary' => 'ctools_argument_nid_criteria_summary',
   );
   return $args;
 }
@@ -48,69 +45,3 @@ function ctools_argument_nid_context($arg = NULL, $conf = NULL, $empty = FALSE)
 
   return ctools_context_create('node', $node);
 }
-
-/**
- * Provide a criteria form for selecting a node.
- */
-function ctools_argument_nid_criteria_form(&$form, &$form_state, $conf, $argument, $id) {
-  // Ensure $conf has valid defaults:
-  if (!is_array($conf)) {
-    $conf = array();
-  }
-
-  $conf += array(
-    'type' => array(),
-  );
-
-  $types = node_get_types();
-  foreach ($types as $type => $info) {
-    $options[$type] = check_plain($info->name);
-  }
-
-  $form[$id]['type'] = array(
-    '#title' => t('Select types for %identifier', array('%identifier' => $argument['identifier'])),
-    '#type' => 'checkboxes',
-    '#options' => $options,
-    '#description' => t('This item will only be selected for nodes having the selected node types. If no node types are selected, it will be selected for all node types.'),
-    '#default_value' => $conf['type'],
-  );
-}
-
-
-/**
- * Provide a criteria form for selecting a node.
- */
-function ctools_argument_nid_criteria_select($conf, $context) {
-  // As far as I know there should always be a context at this point, but this
-  // is safe.
-  if (empty($context) || empty($context->data) || empty($context->data->type)) {
-    return FALSE;
-  }
-
-  if (array_filter($conf['type']) && empty($conf['type'][$context->data->type])) {
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-/**
- * Provide a summary of the criteria for selecting this node.
- */
-function ctools_argument_nid_criteria_summary($conf, $argument) {
-  if (!isset($conf['type'])) {
-    $conf['type'] = array();
-  }
-  $types = node_get_types();
-
-  $names = array();
-  foreach (array_filter($conf['type']) as $type) {
-    $names[] = check_plain($types[$type]->name);
-  }
-
-  if (empty($names)) {
-    return t('@identifier can be any node type', array('@identifier' => $argument['identifier']));
-  }
-
-  return format_plural(count($names), '@identifier can be type "@types"', '@identifier can be types "@types"', array('@types' => implode(', ', $names), '@identifier' => $argument['identifier']));
-}

plugins/arguments/uid.inc

@@ -17,9 +17,6 @@ function ctools_uid_ctools_arguments() {
     'keyword' => 'user',
     'description' => t('Creates a user context from a user ID argument.'),
     'context' => 'ctools_argument_uid_context',
-    'criteria form' => 'ctools_argument_uid_criteria_form',
-    'criteria select' => 'ctools_argument_uid_criteria_select',
-    'criteria summary' => 'ctools_argument_uid_criteria_summary',
   );
   return $args;
 }
@@ -49,68 +46,3 @@ function ctools_argument_uid_context($arg = NULL, $conf = NULL, $empty = FALSE)
 
   return ctools_context_create('user', $account);
 }
-
-/**
- * Provide a criteria form for selecting a node.
- */
-function ctools_argument_uid_criteria_form(&$form, &$form_state, $conf, $argument, $id) {
-  // Ensure $conf has valid defaults:
-  if (!is_array($conf)) {
-    $conf = array();
-  }
-
-  $conf += array(
-    'rids' => array(),
-  );
-
-
-  $form[$id]['rids'] = array(
-    '#type' => 'checkboxes',
-    '#title' => t('Select roles for %identifier', array('%identifier' => $argument['identifier'])),
-    '#default_value' => $conf['rids'],
-    '#options' => ctools_get_roles(),
-    '#description' => t('This item will only be selected for users having the selected roles. If no roles are selected, it will be selected for all users.'),
-  );
-}
-
-/**
- * Provide a criteria form for selecting a node.
- */
-function ctools_argument_uid_criteria_select($conf, $context) {
-  // As far as I know there should always be a context at this point, but this
-  // is safe.
-  if (empty($context) || empty($context->data) || !isset($context->data->roles)) {
-    return FALSE;
-  }
-
-  $rids = array_filter($conf['rids']);
-  if (!$rids) {
-    return TRUE;
-  }
-
-  $roles = array_keys($context->data->roles);
-  $roles[] = $context->data->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
-
-  return array_intersect($rids, $roles);
-}
-
-/**
- * Provide a summary of the criteria for selecting this node.
- */
-function ctools_argument_uid_criteria_summary($conf, $argument) {
-  if (!isset($conf['rids'])) {
-    $conf['rids'] = array();
-  }
-  $roles = ctools_get_roles();
-
-  $names = array();
-  foreach (array_filter($conf['rids']) as $rid) {
-    $names[] = check_plain($roles[$rid]);
-  }
-
-  if (empty($names)) {
-    return t('@identifier can have any role', array('@identifier' => $argument['identifier']));
-  }
-
-  return format_plural(count($names), '@identifier must have role "@roles"', '@identifier can be one of "@roles"', array('@roles' => implode(', ', $names), '@identifier' => $argument['identifier']));
-}