Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.415.2.9
diff -u -p -r1.415.2.9 theme.inc
--- includes/theme.inc	9 Jul 2008 21:48:28 -0000	1.415.2.9
+++ includes/theme.inc	25 Aug 2008 02:12:08 -0000
@@ -957,18 +957,19 @@ function theme_get_setting($setting_name
 /**
  * Render a system default template, which is essentially a PHP template.
  *
- * @param $file
- *   The filename of the template to render.
+ * @param $template_file
+ *   The filename of the template to render. Note that this will overwrite
+ *   anything stored in $variables['template_file'] if using a preprocess hook.
  * @param $variables
  *   A keyed array of variables that will appear in the output.
  *
  * @return
  *   The output generated by the template.
  */
-function theme_render_template($file, $variables) {
+function theme_render_template($template_file, $variables) {
   extract($variables, EXTR_SKIP);  // Extract the variables to a local namespace
   ob_start();                      // Start output buffering
-  include "./$file";               // Include the file
+  include "./$template_file";      // Include the template file
   $contents = ob_get_contents();   // Get the contents of the buffer
   ob_end_clean();                  // End buffering and discard
   return $contents;                // Return the contents