Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.350
diff -u -p -r1.350 theme.inc
--- includes/theme.inc	17 Apr 2007 07:19:38 -0000	1.350
+++ includes/theme.inc	24 Apr 2007 22:06:56 -0000
@@ -317,7 +317,11 @@ function theme() {
     // The theme call is a function.
     // Include a file if this theme function is held elsewhere.
     if (!empty($info['file'])) {
-      include_once($info['file']);
+      $function_file = $info['file'];
+      if (isset($info['path'])) {
+        $function_file = $info['path'] .'/'. $function_file;
+      }
+      include_once($function_file);
     }
     return call_user_func_array($info['function'], $args);
   }
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.63
diff -u -p -r1.63 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	17 Apr 2007 07:19:39 -0000	1.63
+++ themes/engines/phptemplate/phptemplate.engine	24 Apr 2007 22:06:57 -0000
@@ -257,7 +257,6 @@ function phptemplate_engine_variables_no
  * Prepare the values passed to the theme_comment function to be passed
  * into a pluggable template engine.
  */
-// function phptemplate_comment($comment, $links = 0) {
 function phptemplate_engine_variables_comment(&$variables) {
   $comment = $variables['comment'];
   $variables['author']    = theme('username', $comment);