Commit 8f15e83a authored by quicksketch's avatar quicksketch

Preventing name-space collisions with filefield meta tokens.

parent fc412e8f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Provide a user readable list of FileField Meta tokens. * Provide a user readable list of FileField Meta tokens.
*/ */
function filefield_token_list($type = 'all') { function filefield_meta_token_list($type = 'all') {
if ($type == 'field' || $type == 'all') { if ($type == 'field' || $type == 'all') {
$tokens['file']['filefield-width'] = t('File Video width'); $tokens['file']['filefield-width'] = t('File Video width');
$tokens['file']['filefield-height'] = t('File Video height'); $tokens['file']['filefield-height'] = t('File Video height');
...@@ -36,7 +36,7 @@ function filefield_token_list($type = 'all') { ...@@ -36,7 +36,7 @@ function filefield_token_list($type = 'all') {
* *
* Provide the token values for a given file item. * Provide the token values for a given file item.
*/ */
function filefield_token_values($type, $object = NULL) { function filefield_meta_token_values($type, $object = NULL) {
$tokens = array(); $tokens = array();
if ($type == 'field' && isset($object[0]['fid'])) { if ($type == 'field' && isset($object[0]['fid'])) {
$item = $object[0]; $item = $object[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment