summaryrefslogtreecommitdiffstats
path: root/filefield_meta
diff options
context:
space:
mode:
authorNathan Haug2010-12-06 01:28:08 +0000
committerNathan Haug2010-12-06 01:28:08 +0000
commit8f15e83ac887e0bea67b46d73f3fa695a893cb0c (patch)
treeb944dc45859de2cfb82ba867f308b1444c0a9bac /filefield_meta
parentfc412e8f538a5493f93877e5adef84d75426fcc5 (diff)
Preventing name-space collisions with filefield meta tokens.
Diffstat (limited to 'filefield_meta')
-rw-r--r--filefield_meta/filefield_meta.token.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/filefield_meta/filefield_meta.token.inc b/filefield_meta/filefield_meta.token.inc
index 22cdd58..2a9958e 100644
--- a/filefield_meta/filefield_meta.token.inc
+++ b/filefield_meta/filefield_meta.token.inc
@@ -11,7 +11,7 @@
*
* 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') {
$tokens['file']['filefield-width'] = t('File Video width');
$tokens['file']['filefield-height'] = t('File Video height');
@@ -36,7 +36,7 @@ function filefield_token_list($type = 'all') {
*
* 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();
if ($type == 'field' && isset($object[0]['fid'])) {
$item = $object[0];