--- video.module.orig	2007-04-01 17:02:03.000000000 -0700
+++ video.module	2007-04-01 17:01:45.000000000 -0700
@@ -112,7 +112,6 @@
         }
         $items[] = array('path' => 'node/'. arg(1) .'/play',
           'title' => t('play'),
-          'callback' => 'video_play',
           'access' => user_access('play video'),
           'weight' => 3,
           'type' => $menu_type);
@@ -714,7 +713,7 @@
   // if we are viewing the page, run the body through the theme
   if ($page) {
     $output = '';
-	if (variable_get('video_playinbody', 0)) {
+	if (arg(2) == 'play' || variable_get('video_playinbody', 0)) {
 	  if (user_access('play video')) {
         $output .= theme('video_player', $node);
       }
@@ -724,9 +723,11 @@
         $output .= l(t('register'), "user/register", array('class' => 'outgoing', 'title' => t('create a new account')));
         $output .= t(' to play video');
       }
+	  $node->content['video_player'] = array('#weight' => -1, '#value' => $output);
+	} else {
+		$output .= theme('video_view', $node, $teaser, $page);
+		$node->content['body'] = array('#value' => $output);
 	}
-    $output .= theme('video_view', $node, $teaser, $page);
-	$node->content['body'] = array('#value' => $output);
   }
 
   return $node;
@@ -878,23 +879,6 @@
 }
 
 /**
- * Implements play callback function from node menu
- */
-function video_play() {
-  if ($node = node_load(arg(1))) {
-    drupal_set_title(t('Playing') . ' ' . theme('placeholder', $node->title));
-	$output = theme('video_player', $node);
-    if($output == ''){
-      drupal_goto("node/$node->nid");
-    }
-    return $output;
-  }
-  else {
-    drupal_not_found();
-  }
-}
-
-/**
  * Theme the teaser
  * 
  * This is just in place for site admins and theme developers