Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.481
diff -u -p -r1.481 theme.inc
--- includes/theme.inc	3 May 2009 08:12:12 -0000	1.481
+++ includes/theme.inc	8 May 2009 17:26:38 -0000
@@ -335,8 +335,7 @@ function _theme_process_registry(&$cache
         elseif ($type == 'theme_engine' || $type == 'base_theme_engine') {
           // Theme engines get an extra set that come before the normally named preprocessors.
           $prefixes[] = $name . '_engine';
-          // The theme engine also registers on behalf of the theme. The theme or engine name can be used.
-          $prefixes[] = $name;
+          // The theme engine also registers on behalf of the theme. The theme name should be used.
           $prefixes[] = $theme;
         }
         else {
@@ -541,22 +540,6 @@ function list_themes($refresh = FALSE) {
  *   This is the same as the previous function, but it is called for a single
  *   theming hook.
  *
- * - ENGINE_preprocess(&$variables)
- *   This is meant to be used by themes that utilize a theme engine. It is
- *   provided so that the preprocessor is not locked into a specific theme.
- *   This makes it easy to share and transport code but theme authors must be
- *   careful to prevent fatal re-declaration errors when using sub-themes that
- *   have their own preprocessor named exactly the same as its base theme. In
- *   the default theme engine (PHPTemplate), sub-themes will load their own
- *   template.php file in addition to the one used for its parent theme. This
- *   increases the risk for these errors. A good practice is to use the engine
- *   name for the base theme and the theme name for the sub-themes to minimize
- *   this possibility.
- *
- * - ENGINE_preprocess_HOOK(&$variables)
- *   The same applies from the previous function, but it is called for a
- *   specific hook.
- *
  * - THEME_preprocess(&$variables)
  *   These functions are based upon the raw theme; they should primarily be
  *   used by themes that do not use an engine or by sub-themes. It serves the
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.71
diff -u -p -r1.71 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	20 Sep 2008 20:22:25 -0000	1.71
+++ themes/engines/phptemplate/phptemplate.engine	8 May 2009 17:26:41 -0000
@@ -20,8 +20,7 @@ function phptemplate_init($template) {
  * we need to.
  */
 function phptemplate_theme($existing, $type, $theme, $path) {
-  $templates = drupal_find_theme_functions($existing, array('phptemplate', $theme));
+  $templates = drupal_find_theme_functions($existing, array($theme));
   $templates += drupal_find_theme_templates($existing, '.tpl.php', $path);
   return $templates;
 }
-
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.20
diff -u -p -r1.20 template.php
--- themes/garland/template.php	20 Jan 2009 03:18:41 -0000	1.20
+++ themes/garland/template.php	8 May 2009 17:26:42 -0000
@@ -66,7 +66,7 @@ function garland_menu_local_tasks() {
 /**
  * Format the "Submitted by username on date/time" for each comment.
  */
-function phptemplate_comment_submitted($comment) {
+function garland_comment_submitted($comment) {
   return t('!datetime — !username',
     array(
       '!username' => theme('username', $comment),