? menu.module.patch
? node_types_rebuild.patch
? preprocess-rename-file-to-template_file.d7.patch
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.450
diff -u -p -r1.450 theme.inc
--- includes/theme.inc	10 Nov 2008 15:40:03 -0000	1.450
+++ includes/theme.inc	11 Nov 2008 12:09:29 -0000
@@ -993,18 +993,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 DRUPAL_ROOT . '/' . $file;   // Include the file
+  include DRUPAL_ROOT . '/' . $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