? .kdev4
? 484600-views-disable_live_preview_1_0.patch.1
? sites
? views-531686-7.3-install
? views-7-update.patch.1
? views-DRUPAL-7--3.kdev4
? views-taxonomy-7.patch
Index: help/api-tables.html
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/help/api-tables.html,v
retrieving revision 1.8.4.1
diff -u -p -r1.8.4.1 api-tables.html
--- help/api-tables.html 2 Nov 2009 22:01:26 -0000 1.8.4.1
+++ help/api-tables.html 15 May 2010 06:22:01 -0000
@@ -98,20 +98,20 @@ For Views to use your table, it has to e
-
How term_data joins to node
+
How taxonomy_term_data joins to node
-In the above example, to use these with 'node' as the base table, both 'term_data' and 'term_node' need to be defined, and they each need a join handler for node:
+In the above example, to use these with 'node' as the base table, both 'taxonomy_term_data' and 'term_node' need to be defined, and they each need a join handler for node:
-$data['term_data']['table']['join']['node'] = array(
+$data['taxonomy_term_data']['table']['join']['node'] = array(
'left_table' => 'term_node',
'left_field' => 'tid',
'field' => 'tid',
);
-The above can be read as "In order to join to the node table, the term_data table must first link to the term_node table, and they join on the 'tid' field.". When adding this table to the query for a node view, Views will look at this and then look for the term_node table.
+The above can be read as "In order to join to the node table, the taxonomy_term_data table must first link to the term_node table, and they join on the 'tid' field.". When adding this table to the query for a node view, Views will look at this and then look for the term_node table.
$data['term_node']['table']['join']['node'] = array(
Index: modules/taxonomy.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy.views.inc,v
retrieving revision 1.57.4.10
diff -u -p -r1.57.4.10 taxonomy.views.inc
--- modules/taxonomy.views.inc 29 Apr 2010 18:17:32 -0000 1.57.4.10
+++ modules/taxonomy.views.inc 15 May 2010 06:22:02 -0000
@@ -24,20 +24,20 @@ function taxonomy_views_data() {
$data['taxonomy_vocabulary']['table']['group'] = t('Taxonomy');
$data['taxonomy_vocabulary']['table']['join'] = array(
- // vocabulary links to term_data directly via vid.
- 'term_data' => array(
+ // vocabulary links to taxonomy_term_data directly via vid.
+ 'taxonomy_term_data' => array(
'left_field' => 'vid',
'field' => 'vid',
),
- // vocabulary links to node through term_data via vid
+ // vocabulary links to node through taxonomy_term_data via vid
'node' => array(
- 'left_table' => 'term_data',
+ 'left_table' => 'taxonomy_term_data',
'left_field' => 'vid',
'field' => 'vid',
),
- // vocabulary links to node_revision via term_data
+ // vocabulary links to node_revision via taxonomy_term_data
'node_revision' => array(
- 'left_table' => 'term_data',
+ 'left_table' => 'taxonomy_term_data',
'left_field' => 'vid',
'field' => 'vid',
),
@@ -77,10 +77,10 @@ function taxonomy_views_data() {
);
// ----------------------------------------------------------------------
- // term_data table
+ // taxonomy_term_data table
- $data['term_data']['table']['group'] = t('Taxonomy');
- $data['term_data']['table']['base'] = array(
+ $data['taxonomy_term_data']['table']['group'] = t('Taxonomy');
+ $data['taxonomy_term_data']['table']['base'] = array(
'field' => 'tid',
'title' => t('Term'),
'help' => t('Taxonomy terms are attached to nodes.'),
@@ -88,7 +88,7 @@ function taxonomy_views_data() {
// The term data table
- $data['term_data']['table']['join'] = array(
+ $data['taxonomy_term_data']['table']['join'] = array(
'node' => array(
'left_table' => 'term_node',
'left_field' => 'tid',
@@ -107,7 +107,7 @@ function taxonomy_views_data() {
);
// tid field
- $data['term_data']['tid'] = array(
+ $data['taxonomy_term_data']['tid'] = array(
'title' => t('Term ID'),
'help' => t('The taxonomy term ID'),
'field' => array(
@@ -124,14 +124,14 @@ function taxonomy_views_data() {
),
'filter' => array(
'handler' => 'views_handler_filter_term_node_tid',
- 'hierarchy table' => 'term_hierarchy',
+ 'hierarchy table' => 'taxonomy_term_hierarchy',
'numeric' => TRUE,
'skip base' => array('node', 'node_revision'),
),
);
// Term name field
- $data['term_data']['name'] = array(
+ $data['taxonomy_term_data']['name'] = array(
'title' => t('Term'),
'help' => t('Taxonomy terms. Note that using this can cause duplicate nodes to appear in views; you must add filters to reduce the result set.'),
'field' => array(
@@ -154,7 +154,7 @@ function taxonomy_views_data() {
);
// taxonomy weight
- $data['term_data']['weight'] = array(
+ $data['taxonomy_term_data']['weight'] = array(
'title' => t('Weight'),
'help' => t('The term weight field'),
'field' => array(
@@ -167,7 +167,7 @@ function taxonomy_views_data() {
);
// Term description
- $data['term_data']['description'] = array(
+ $data['taxonomy_term_data']['description'] = array(
'title' => t('Term description'), // The item it appears as on the UI,
'help' => t('The description associated with a taxonomy term.'),
'field' => array(
@@ -179,7 +179,7 @@ function taxonomy_views_data() {
);
// Term vocabulary
- $data['term_data']['vid'] = array(
+ $data['taxonomy_term_data']['vid'] = array(
'title' => t('Vocabulary'),
'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
'filter' => array(
@@ -188,7 +188,7 @@ function taxonomy_views_data() {
);
// Link to edit the term
- $data['term_data']['edit_term'] = array(
+ $data['taxonomy_term_data']['edit_term'] = array(
'field' => array(
'title' => t('Term edit link'),
'help' => t('Provide a simple link to edit the term.'),
@@ -202,8 +202,8 @@ function taxonomy_views_data() {
$data['term_node']['table']['group'] = t('Taxonomy');
$data['term_node']['table']['join'] = array(
- 'term_data' => array(
- // links directly to term_data via tid
+ 'taxonomy_term_data' => array(
+ // links directly to taxonomy_term_data via tid
'left_field' => 'tid',
'field' => 'tid',
),
@@ -217,7 +217,7 @@ function taxonomy_views_data() {
'left_field' => 'vid',
'field' => 'vid',
),
- 'term_hierarchy' => array(
+ 'taxonomy_term_hierarchy' => array(
'left_field' => 'tid',
'field' => 'tid',
),
@@ -242,38 +242,38 @@ function taxonomy_views_data() {
'title' => t('All terms'),
'help' => t('Display all taxonomy terms associated with a node from specified vocabularies.'),
'handler' => 'views_handler_field_term_node_tid',
- 'skip base' => 'term_data',
+ 'skip base' => 'taxonomy_term_data',
'no group by' => TRUE,
),
'argument' => array(
'handler' => 'views_handler_argument_term_node_tid',
- 'name table' => 'term_data',
+ 'name table' => 'taxonomy_term_data',
'name field' => 'name',
'empty field name' => t('Uncategorized'),
'numeric' => TRUE,
- 'skip base' => 'term_data',
+ 'skip base' => 'taxonomy_term_data',
),
'filter' => array(
'title' => t('Term'),
'handler' => 'views_handler_filter_term_node_tid',
- 'hierarchy table' => 'term_hierarchy',
+ 'hierarchy table' => 'taxonomy_term_hierarchy',
'numeric' => TRUE,
- 'skip base' => 'term_data',
+ 'skip base' => 'taxonomy_term_data',
'allow empty' => TRUE,
),
);
- // term_relation
+ // taxonomy_term_relation
- $data['term_relation']['table']['group'] = t('Taxonomy');
+ $data['taxonomy_term_relation']['table']['group'] = t('Taxonomy');
- $data['term_relation']['table']['join'] = array(
- 'term_data' => array(
- // links directly to term_data via tid
+ $data['taxonomy_term_relation']['table']['join'] = array(
+ 'taxonomy_term_data' => array(
+ // links directly to taxonomy_term_data via tid
'left_field' => 'tid',
'field' => 'tid1',
),
- 'term_relation' => array(
+ 'taxonomy_term_relation' => array(
// links to self through left.tid1 = right.tid2
'left_field' => 'tid1',
'field' => 'tid2',
@@ -290,11 +290,11 @@ function taxonomy_views_data() {
),
);
- $data['term_relation']['tid2'] = array(
+ $data['taxonomy_term_relation']['tid2'] = array(
'title' => t('Related terms'),
'help' => t('The related terms of the term. This can produce duplicate entries if there is more than one related term.'),
'relationship' => array(
- 'base' => 'term_data',
+ 'base' => 'taxonomy_term_data',
'field' => 'tid2',
'label' => t('Related term'),
),
@@ -307,38 +307,38 @@ function taxonomy_views_data() {
// ----------------------------------------------------------------------
// term_hierarchy table
- $data['term_hierarchy']['table']['group'] = t('Taxonomy');
+ $data['taxonomy_term_hierarchy']['table']['group'] = t('Taxonomy');
- $data['term_hierarchy']['table']['join'] = array(
- 'term_hierarchy' => array(
+ $data['taxonomy_term_hierarchy']['table']['join'] = array(
+ 'taxonomy_term_hierarchy' => array(
// links to self through left.parent = right.tid (going down in depth)
'left_field' => 'tid',
'field' => 'parent',
),
- 'term_data' => array(
- // links directly to term_data via tid
+ 'taxonomy_term_data' => array(
+ // links directly to taxonomy_term_data via tid
'left_field' => 'tid',
'field' => 'tid',
),
'node' => array(
- // links to node thorugh term_data
- 'left_table' => 'term_data',
+ // links to node thorugh taxonomy_term_data
+ 'left_table' => 'taxonomy_term_data',
'left_field' => 'tid',
'field' => 'tid',
),
'node_revisions' => array(
- // links to node_revisions thorugh term_data
- 'left_table' => 'term_data',
+ // links to node_revisions thorugh taxonomy_term_data
+ 'left_table' => 'taxonomy_term_data',
'left_field' => 'tid',
'field' => 'tid',
),
);
- $data['term_hierarchy']['parent'] = array(
+ $data['taxonomy_term_hierarchy']['parent'] = array(
'title' => t('Parent term'),
'help' => t('The parent term of the term. This can produce duplicate entries if you are using a vocabulary that allows multiple parents.'),
'relationship' => array(
- 'base' => 'term_data',
+ 'base' => 'taxonomy_term_data',
'field' => 'parent',
'label' => t('Parent'),
),
@@ -354,8 +354,8 @@ function taxonomy_views_data() {
$data['term_synonym']['table']['group'] = t('Taxonomy');
$data['term_synonym']['table']['join'] = array(
- 'term_data' => array(
- // links directly to term_data via tid
+ 'taxonomy_term_data' => array(
+ // links directly to taxonomy_term_data via tid
'left_field' => 'tid',
'field' => 'tid',
),
@@ -394,7 +394,7 @@ function taxonomy_views_data_alter(&$dat
'relationship' => array(
'handler' => 'views_handler_relationship_node_term_data',
'label' => t('term'),
- 'base' => 'term_data',
+ 'base' => 'taxonomy_term_data',
),
);
Index: modules/taxonomy/views_handler_argument_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 views_handler_argument_term_node_tid.inc
--- modules/taxonomy/views_handler_argument_term_node_tid.inc 24 Dec 2009 00:37:01 -0000 1.1.6.2
+++ modules/taxonomy/views_handler_argument_term_node_tid.inc 15 May 2010 06:22:03 -0000
@@ -47,7 +47,7 @@ class views_handler_argument_term_node_t
function summary_argument($data) {
if (!empty($this->options['use_synonym_for_summary_links'])) {
- $synonym = db_result(db_query_range("SELECT name FROM {term_synonym} WHERE tid = %d", $data->{$this->base_alias}, 0, 1));
+ $synonym = db_result(db_query_range("SELECT name FROM {taxonomy_term_synonym} WHERE tid = %d", $data->{$this->base_alias}, 0, 1));
if (!empty($synonym)) {
return $synonym;
}
Index: modules/taxonomy/views_handler_field_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc,v
retrieving revision 1.3
diff -u -p -r1.3 views_handler_field_taxonomy.inc
--- modules/taxonomy/views_handler_field_taxonomy.inc 30 Jan 2009 00:01:42 -0000 1.3
+++ modules/taxonomy/views_handler_field_taxonomy.inc 15 May 2010 06:22:03 -0000
@@ -9,7 +9,7 @@ class views_handler_field_taxonomy exten
/**
* Constructor to provide additional field to add.
*
- * This constructer assumes the term_data table. If using another
+ * This constructer assumes the taxonomy_term_data table. If using another
* table, we'll need to be more specific.
*/
function construct() {
Index: modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc,v
retrieving revision 1.1.6.1
diff -u -p -r1.1.6.1 views_handler_filter_term_node_tid_depth.inc
--- modules/taxonomy/views_handler_filter_term_node_tid_depth.inc 2 Nov 2009 22:01:26 -0000 1.1.6.1
+++ modules/taxonomy/views_handler_filter_term_node_tid_depth.inc 15 May 2010 06:22:03 -0000
@@ -67,17 +67,17 @@ class views_handler_filter_term_node_tid
$last = "tn";
if ($this->options['depth'] > 0) {
- $subquery->leftJoin('term_hierarchy', 'th', "th.tid = tn.tid");
+ $subquery->leftJoin('taxonomy_term_hierarchy', 'th', "th.tid = tn.tid");
$last = "th";
foreach (range(1, abs($this->options['depth'])) as $count) {
- $subquery->leftJoin('term_hierarchy', "th$count", "$last.parent = th$count.tid");
+ $subquery->leftJoin('taxonomy_term_hierarchy', "th$count", "$last.parent = th$count.tid");
$where->condition("th$count.tid", $this->value, $operator);
$last = "th$count";
}
}
elseif ($this->options['depth'] < 0) {
foreach (range(1, abs($this->options['depth'])) as $count) {
- $subquery->leftJoin('term_hierarchy', "th$count", "$last.tid = th$count.parent");
+ $subquery->leftJoin('taxonomy_term_hierarchy', "th$count", "$last.tid = th$count.parent");
$where->condition("th$count.tid", $this->value, $operator);
$last = "th$count";
}
Index: modules/taxonomy/views_handler_relationship_node_term_data.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc,v
retrieving revision 1.3.4.1
diff -u -p -r1.3.4.1 views_handler_relationship_node_term_data.inc
--- modules/taxonomy/views_handler_relationship_node_term_data.inc 2 Nov 2009 22:01:26 -0000 1.3.4.1
+++ modules/taxonomy/views_handler_relationship_node_term_data.inc 15 May 2010 06:22:03 -0000
@@ -40,7 +40,7 @@ class views_handler_relationship_node_te
$this->ensure_my_table();
$def = $this->definition;
- $def['table'] = 'term_data';
+ $def['table'] = 'taxonomy_term_data';
if (!empty($this->options['required']) || !array_filter($this->options['vids'])) {
$term_node = $this->query->add_table('term_node', $this->relationship);
@@ -52,7 +52,7 @@ class views_handler_relationship_node_te
}
}
else {
- // If the join is optional, join a subselect that will emulate term_data table instead
+ // If the join is optional, join a subselect that will emulate taxonomy_term_data table instead
$def['left_table'] = $this->table_alias;
$def['left_field'] = 'vid';
$def['field'] = 'revision';
@@ -70,6 +70,6 @@ class views_handler_relationship_node_te
// use a short alias for this:
$alias = $def['table'] . '_' . $this->table;
- $this->alias = $this->query->add_relationship($alias, $join, 'term_data', $this->relationship);
+ $this->alias = $this->query->add_relationship($alias, $join, 'taxonomy_term_data', $this->relationship);
}
}
Index: plugins/views_plugin_query_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/plugins/Attic/views_plugin_query_default.inc,v
retrieving revision 1.1.4.19
diff -u -p -r1.1.4.19 views_plugin_query_default.inc
--- plugins/views_plugin_query_default.inc 14 May 2010 17:07:10 -0000 1.1.4.19
+++ plugins/views_plugin_query_default.inc 15 May 2010 06:22:05 -0000
@@ -450,7 +450,7 @@ class views_plugin_query_default extends
// add_table() which requires the ability to intentionally add
// the same table with the same join multiple times. For
// example, a view that filters on 3 taxonomy terms using AND
- // needs to join term_data 3 times with the same join.
+ // needs to join taxonomy_term_data 3 times with the same join.
// scan through the table queue to see if a matching join and
// relationship exists. If so, use it instead of this join.
-How term_data joins to node
+How taxonomy_term_data joins to node