Revision d2d48638
Added by Andreas Kohlbecker almost 3 years ago
modules/cdm_dataportal/cdm_tokens/cdm_tokens.module | ||
---|---|---|
39 | 39 |
*/ |
40 | 40 |
function cdm_tokens_tokens($type, $tokens, array $data = array(), array $options = array()) { |
41 | 41 |
$replacements = array(); |
42 |
|
|
43 | 42 |
if ($type == 'cdm') { |
44 | 43 |
$token_values = _cdm_tokens_taxon_or_name(); |
45 | 44 |
foreach ($tokens as $name => $original) { |
modules/cdm_dataportal/ext_links/ext_links.info | ||
---|---|---|
4 | 4 |
version = "7.x-2.0" |
5 | 5 |
package = "CDM" |
6 | 6 |
dependencies[] = cdm_dataportal |
7 |
dependencies[] = cdm_tokens |
|
7 | 8 |
core = 7.x |
8 |
|
|
9 | 9 |
configure = admin/config/cdm_dataportal/extlinks |
modules/cdm_dataportal/ext_links/ext_links.module | ||
---|---|---|
422 | 422 |
$query = 'find_genus=' . $species_name['genus'] . '&find_species=' . $species_name['species']; |
423 | 423 |
break; |
424 | 424 |
default: |
425 |
$query = str_replace('"', '%22', $species_name['genus']) . $ext_link->glue . str_replace('"', '%22', $species_name['species']);
|
|
425 |
$query = rawurlencode($species_name['genus']) . $ext_link->glue . rawurlencode($species_name['species']);
|
|
426 | 426 |
} |
427 | 427 |
$ext_link_array = [ |
428 | 428 |
'title' => $ext_link->title, |
429 |
'url' => $ext_link->link . $query
|
|
429 |
'url' => token_replace($ext_link->link) /* . $query */
|
|
430 | 430 |
]; |
431 | 431 |
return $ext_link_array; |
432 | 432 |
} |
Also available in: Unified diff
ref #9659 using cdm_tokens in ext_links - fist step