diff --git a/includes/content.inc b/includes/content.inc index b57047904d5e60b83f8df412d01e73995dd80ad3..a55f7ec5e897b346f05a7a0d7041d3fc9485eda1 100644 --- a/includes/content.inc +++ b/includes/content.inc @@ -498,7 +498,6 @@ function ctools_content_configure_form_defaults($form, &$form_state) { '#default_value' => isset($conf['override_title_text']) ? $conf['override_title_text'] : '', '#size' => 35, '#id' => 'override-title-textfield', - '#process' => array('ctools_dependent_process'), '#dependency' => array('override-title-checkbox' => array(1)), '#dependency_type' => 'disable', ); diff --git a/page_manager/page_manager.admin.inc b/page_manager/page_manager.admin.inc index cdf40086f84070af58cad541646ea6632ada1c0d..85608f77f0afd97e7db016be4a87f20d3526fda7 100644 --- a/page_manager/page_manager.admin.inc +++ b/page_manager/page_manager.admin.inc @@ -1414,7 +1414,6 @@ function page_manager_handler_add_form($form, $form_state, $features = array()) if ($plugin != 'default') { $form['features'][$plugin][$feature_id] += array( - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-handler' => array($plugin)), ); } diff --git a/page_manager/plugins/task_handlers/http_response.inc b/page_manager/plugins/task_handlers/http_response.inc index 72c98cad30d01008a5e75e0a17d8a3b0c1e440ca..ba549b49d0db5d0b1c305ba6be5c9405f63f2739 100644 --- a/page_manager/plugins/task_handlers/http_response.inc +++ b/page_manager/plugins/task_handlers/http_response.inc @@ -235,7 +235,6 @@ function page_manager_http_response_edit_settings($form, &$form_state) { '#type' => 'textfield', '#title' => t('Redirect destination'), '#default_value' => $conf['destination'], - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-code' => array(301)), '#description' => t('Enter the path to redirect to. You may use keyword substitutions from contexts. You can use external urls (http://www.example.com/foo) or internal urls (node/1).'), ); diff --git a/page_manager/plugins/tasks/page.admin.inc b/page_manager/plugins/tasks/page.admin.inc index d4b67deb9fc851119ed3950761d6b9dbcafc7c2b..cf3330157bc67d52435c71350cdebdf9346ad240 100644 --- a/page_manager/plugins/tasks/page.admin.inc +++ b/page_manager/plugins/tasks/page.admin.inc @@ -699,7 +699,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#type' => 'textfield', '#default_value' => $menu['title'], '#description' => t('If set to normal or tab, enter the text to use for the menu item.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab', 'action')), ); @@ -713,7 +712,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#options' => menu_get_menus(), '#default_value' => $menu['name'], '#description' => t('Insert item into an available menu.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('normal')), ); } @@ -731,7 +729,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#type' => 'textfield', '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0, '#description' => t('The lower the weight the higher/further left it will appear.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab', 'action')), ); @@ -743,7 +740,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#options' => array('none' => t('No menu entry'), 'normal' => t('Normal menu item'), 'tab' => t('Menu tab')), '#default_value' => $menu['parent']['type'], '#description' => t('When providing a menu item as a default tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.'), - '#process' => array('form_process_radios', 'ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('default tab')), ); $form['menu']['parent']['title'] = array( @@ -751,7 +747,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#type' => 'textfield', '#default_value' => $menu['parent']['title'], '#description' => t('If creating a parent menu item, enter the title of the item.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('normal', 'tab')), '#dependency_count' => 2, ); @@ -763,7 +758,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#options' => menu_get_menus(), '#default_value' => $menu['parent']['name'], '#description' => t('Insert item into an available menu.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('normal')), '#dependency_count' => 2, ); @@ -780,7 +774,6 @@ function page_manager_page_form_menu($form, &$form_state) { '#default_value' => $menu['parent']['weight'], '#size' => 5, '#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('tab')), '#dependency_count' => 2, ); diff --git a/plugins/access/term.inc b/plugins/access/term.inc index 2b39ff46f9e5511bf6a4302b2b837ee569be7359..043f421a170e29769a9d25965e51bf5546213634 100644 --- a/plugins/access/term.inc +++ b/plugins/access/term.inc @@ -60,7 +60,6 @@ function ctools_term_ctools_access_settings($form, &$form_state, $conf) { $form['settings'][$vocabulary->vid] = array( '#title' => t('Terms'), '#description' => t('Select a term or terms from @vocabulary.', array('@vocabulary' => $vocabulary->name)), //. $description, - '#process' => array('ctools_dependent_process'), '#dependency' => array('ctools-select-vid' => array($vocabulary->vid)), '#default_value' => !empty($conf[$vid]) ? $conf[$vid] : '', '#multiple' => TRUE, diff --git a/plugins/access/term_has_parent.inc b/plugins/access/term_has_parent.inc index 9fd4c6d879c654938162dea04719e07964846cd6..2c86d1cf12335ceb75dfa9efd65d8ea62628e2df 100644 --- a/plugins/access/term_has_parent.inc +++ b/plugins/access/term_has_parent.inc @@ -33,7 +33,7 @@ function ctools_term_has_parent_ctools_access_settings($form, &$form_state, $con if (!isset($conf['vid'])) { $conf['vid'] = 0; } - + $form['settings']['vid'] = array( '#title' => t('Vocabulary'), '#type' => 'select', @@ -59,7 +59,6 @@ function ctools_term_has_parent_ctools_access_settings($form, &$form_state, $con $form['settings'][$vid] = array( '#title' => t('Terms'), '#description' => t('Select a term or terms from @vocabulary.', array('@vocabulary' => $vocabulary->name)), - '#process' => array('ctools_dependent_process'), '#dependency' => array('ctools-select-vid' => array($vocabulary->vid)), '#default_value' => !empty($conf[$vid]) ? $conf[$vid] : '', '#size' => 10, @@ -102,7 +101,7 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) { return FALSE; } $vid = $conf['vid']; - + // we'll start looking up the hierarchy from our context term id. $current_term = $context->data->tid; @@ -113,29 +112,29 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) { // select parent as term_parent to avoid PHP5 complications with the parent keyword //@todo: Find a way to reduce the number of queries required for really deep hierarchies. $term = db_query("SELECT parent AS term_parent, tid AS tid FROM {taxonomy_term_hierarchy} th WHERE th.tid = :tid", array(':tid'=>$current_term))->fetchObject(); - + // if no term is found, get out of the loop if (!$term || empty($term->tid)) { break; } - + // check the term selected, if the user asked it to. if (!empty($conf['include_self']) && in_array($term->tid, $conf[$vid])) { return TRUE; } - + // did we find the parent TID we were looking for? if (in_array($term->term_parent, $conf[$vid])) { // YES, we're done! return TRUE; } // Nope, we didn't find it. - + // If this is the top of the hierarchy, stop scanning. if ($term->term_parent==0) { break; } - + // update the parent, and keep scanning. $current_term = $term->term_parent; } diff --git a/plugins/content_types/custom/custom.inc b/plugins/content_types/custom/custom.inc index 937653057872a162730ffca014fddfc94b6b47f5..6a705ac90feb47e37d790bbde65642a5dea30e00 100644 --- a/plugins/content_types/custom/custom.inc +++ b/plugins/content_types/custom/custom.inc @@ -321,7 +321,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) { '#type' => 'textfield', '#title' => t('Machine name'), '#description' => t('The machine readable name of this content. It must be unique, and it must contain only alphanumeric characters and underscores. Once created, you will not be able to change this value!'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-reusable' => array(1)), ); @@ -329,7 +328,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) { '#type' => 'textfield', '#title' => t('Category'), '#description' => t('What category this content should appear in. If left blank the category will be "Miscellaneous".'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-reusable' => array(1)), ); @@ -337,7 +335,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) { '#type' => 'textarea', '#title' => t('Administrative description'), '#description' => t('A description of what this content is, does or is for, for administrative use.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-reusable' => array(1)), ); return $form; diff --git a/plugins/content_types/node_context/node_terms.inc b/plugins/content_types/node_context/node_terms.inc index 3ea1fcd09cd32e01d7f61ce6a11a17e823b55da1..e2e73919b4d8a04d4e97c5707fa79312f06b1d33 100644 --- a/plugins/content_types/node_context/node_terms.inc +++ b/plugins/content_types/node_context/node_terms.inc @@ -146,7 +146,6 @@ function ctools_node_terms_content_type_edit_form($form, &$form_state) { '#type' => 'checkbox', '#default_value' => $conf['link'], '#description' => t('Check here to make the terms link to the term paths.'), - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:term_format' => array('inline-delimited', 'ul')), '#prefix' => '
', '#suffix' => '
', @@ -157,7 +156,6 @@ function ctools_node_terms_content_type_edit_form($form, &$form_state) { '#title' => t('Term delimiter'), '#default_value' => $conf['term_delimiter'], '#size' => 10, - '#process' => array('ctools_dependent_process'), '#dependency' => array('radio:term_format' => array('inline-delimited')), ); return $form; diff --git a/plugins/content_types/search/search_form.inc b/plugins/content_types/search/search_form.inc index 6fd9e4186baa299461c4f9d11be751e31d569984..2ab1fa7b4e0d378a6d249f6b662423e363d7186c 100644 --- a/plugins/content_types/search/search_form.inc +++ b/plugins/content_types/search/search_form.inc @@ -121,7 +121,6 @@ function ctools_search_form_content_type_edit_form($form, &$form_state) { $form['path'] = array( '#type' => 'textfield', '#default_value' => $conf['path'], - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-path-type' => array('custom')), '#suffix' => '', ); @@ -136,7 +135,6 @@ function ctools_search_form_content_type_edit_form($form, &$form_state) { $form['prompt'] = array( '#type' => 'textfield', '#default_value' => $conf['prompt'], - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-override-prompt' => array(1)), '#suffix' => '', ); diff --git a/plugins/content_types/search/search_result.inc b/plugins/content_types/search/search_result.inc index f491a75c4b506bf3dc12a0ee795e6ceeccb376af..918b6fe03a73fa503bca71df7294b930857b32ed 100644 --- a/plugins/content_types/search/search_result.inc +++ b/plugins/content_types/search/search_result.inc @@ -116,7 +116,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) { '#title' => t('Title'), '#type' => 'textfield', '#default_value' => $conf['empty_title'], - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-override-empty' => array(1)), ); @@ -124,7 +123,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) { '#title' => t('No result text'), '#type' => 'textarea', '#default_value' => $conf['empty'], - '#process' => array('ctools_dependent_process'), '#dependency' => array('edit-override-empty' => array(1)), ); @@ -132,7 +130,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) { '#type' => 'hidden', '#id' => 'edit-empty-format', '#prefix' => '