Index: modules/rdf/rdf.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/rdf/rdf.module,v
retrieving revision 1.8
diff -u -p -r1.8 rdf.module
--- modules/rdf/rdf.module	12 Nov 2009 07:00:48 -0000	1.8
+++ modules/rdf/rdf.module	16 Nov 2009 03:11:12 -0000
@@ -343,8 +343,8 @@ function rdf_process(&$variables, $hook)
   // and field items. Does this by adjusting the variable sent to the template
   // so that the template doesn't have to worry about it.
   // @see theme_rdf_template_variable_wrapper()
-  if (!empty($variables['rdf_template_variable_attributes_array'])) {
-    foreach ($variables['rdf_template_variable_attributes_array'] as $variable_name => $attributes) {
+  if (!empty($variables['rdf_attributes_array'])) {
+    foreach ($variables['rdf_attributes_array'] as $variable_name => $attributes) {
       $context = array(
         'hook' => $hook,
         'variable_name' => $variable_name,
@@ -400,11 +400,11 @@ function rdf_preprocess_node(&$variables
   // Adds RDFa markup for the date.
   if (!empty($variables['rdf_mapping']['created'])) {
     $date_attributes_array = rdf_rdfa_attributes($variables['rdf_mapping']['created'], $variables['created']);
-    $variables['rdf_template_variable_attributes_array']['date'] = $date_attributes_array;
+    $variables['rdf_attributes_array']['date'] = $date_attributes_array;
   }
   // Adds RDFa markup for the relation between the node and its author.
   if (!empty($variables['rdf_mapping']['uid'])) {
-    $variables['rdf_template_variable_attributes_array']['name']['rel'] = $variables['rdf_mapping']['uid']['predicates'];
+    $variables['rdf_attributes_array']['name']['rel'] = $variables['rdf_mapping']['uid']['predicates'];
   }
 }
 
@@ -503,11 +503,11 @@ function rdf_preprocess_comment(&$variab
   // Adds RDFa markup for the date of the comment.
   if (!empty($comment->rdf_mapping['created'])) {
     $date_attributes_array = rdf_rdfa_attributes($comment->rdf_mapping['created'], $comment->created);
-    $variables['rdf_template_variable_attributes_array']['created'] = $date_attributes_array;
+    $variables['rdf_attributes_array']['created'] = $date_attributes_array;
   }
   // Adds RDFa markup for the relation between the comment and its author.
   if (!empty($comment->rdf_mapping['uid'])) {
-    $variables['rdf_template_variable_attributes_array']['author']['rel'] = $comment->rdf_mapping['uid']['predicates'];
+    $variables['rdf_attributes_array']['author']['rel'] = $comment->rdf_mapping['uid']['predicates'];
   }
   if (!empty($comment->rdf_mapping['title'])) {
     // Adds RDFa markup to the subject of the comment. Because the RDFa markup is
@@ -587,8 +587,8 @@ function rdf_preprocess_field_formatter_
  *     therefore can be validly wrapped by a 'span' tag. FALSE if the content
  *     might contain block level HTML elements and therefore cannot be validly
  *     wrapped by a 'span' tag. Modules implementing preprocess functions that
- *     set 'rdf_template_variable_attributes_array' for a particular template
- *     variable that might contain block level HTML must also implement
+ *     set 'rdf_attributes_array' for a particular template variable that might
+ *     contain block level HTML must also implement
  *     hook_preprocess_rdf_template_variable_wrapper() and set 'inline' to FALSE
  *     for that context. Themes that render normally inline content with block
  *     level HTML must similarly implement
@@ -604,7 +604,7 @@ function rdf_preprocess_field_formatter_
  * an extra wrapper element, you can override this function to not wrap that
  * variable and instead print the following inside your template file:
  * @code
- *   drupal_attributes($rdf_template_variable_attributes_array[$variable_name])
+ *   drupal_attributes($rdf_attributes_array[$variable_name])
  * @endcode
  *
  * @see rdf_process()