diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-01-29 12:14:44 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-01-29 12:14:44 +0000 |
| commit | 7b7bd71132f2d066265f7a9b7cc553818b86e5a9 (patch) | |
| tree | ee1ce21939d2585095c2ca78c2ef2f42b4bc756e /modules/node | |
| parent | 68d000561db973c54f4289bce86c55de718543a9 (diff) | |
| download | brdo-7b7bd71132f2d066265f7a9b7cc553818b86e5a9.tar.gz brdo-7b7bd71132f2d066265f7a9b7cc553818b86e5a9.tar.bz2 | |
- Patch #693362 by catch, Dave Reid: taxonomy_form_all() is dangerous and ?q=admin/content can be a performance killer.
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.admin.inc | 9 | ||||
| -rw-r--r-- | modules/node/node.module | 13 |
2 files changed, 0 insertions, 22 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index b2539b0ea..3db9033ec 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -97,15 +97,6 @@ function node_filters() { ) + node_type_get_names(), ); - // The taxonomy filter - if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) { - $filters['term'] = array( - 'title' => t('term'), - 'options' => array( - '[any]' => t('any'), - ) + $taxonomy, - ); - } // Language filter if there is a list of languages if ($languages = module_invoke('locale', 'language_list')) { $languages = array(LANGUAGE_NONE => t('Language neutral')) + $languages; diff --git a/modules/node/node.module b/modules/node/node.module index 971aeadf9..c454bd7fc 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2503,19 +2503,6 @@ function node_form_search_form_alter(&$form, $form_state) { '#maxlength' => 255, ); - // Taxonomy box: - if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) { - $form['advanced']['term'] = array( - '#type' => 'select', - '#title' => t('Only in the term(s)'), - '#prefix' => '<div class="criterion">', - '#size' => 10, - '#suffix' => '</div>', - '#options' => $taxonomy, - '#multiple' => TRUE, - ); - } - // Node types: $types = array_map('check_plain', node_type_get_names()); $form['advanced']['type'] = array( |