bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.x-3.6

Browse Source 
Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
bachy
2013-03-29 17:18:33 +01:00
parent 184a808558
commit 578adab53b
21 changed files with 149 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/aggregator/views_handler_argument_aggregator_iid.inc
View File

@@ -18,9 +18,9 @@ class views_handler_argument_aggregator_iid extends views_handler_argument_numer
$titles = array();
$placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
$result = db_select('aggregator_item')
$result = db_select('aggregator_item', 'ai')
->condition('iid', $this->value, 'IN')
->fields(array('title'))
->fields('ai', array('title'))
->execute();
foreach ($result as $term) {
$titles[] = check_plain($term->title);

10
modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
View File

@@ -103,7 +103,8 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
if (!$term) {
return FALSE;
}
$this->argument->validated_title = check_plain($term->name);
$term = taxonomy_term_load($term->tid);
$this->argument->validated_title = check_plain(entity_label('taxonomy_term', $term));
return empty($vocabularies) || !empty($vocabularies[$term->machine_name]);
case 'tids':
@@ -151,8 +152,8 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$validated_cache[$term->tid] = FALSE;
return FALSE;
}
$titles[] = $validated_cache[$term->tid] = check_plain($term->name);
$term = taxonomy_term_load($term->tid);
$titles[] = $validated_cache[$term->tid] = check_plain(entity_label('taxonomy_term', $term));
unset($test[$term->tid]);
}
}
@@ -185,7 +186,8 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
if ($type == 'convert') {
$this->argument->argument = $term->tid;
}
$this->argument->validated_title = check_plain($term->name);
$term = taxonomy_term_load($term->tid);
$this->argument->validated_title = check_plain(entity_label('taxonomy_term', $term));
return TRUE;
}
return FALSE;