Updated OSB to work with KH 3.1

modules/checkout/classes/controller/checkout.php

@@ -24,13 +24,12 @@ class Controller_Checkout extends Controller_TemplateDefault {
 
 		// @todo - this should be a global config item
 		$mediapath = Route::get('default/media');
-		$block = new block;
 
 		// @todo Items in the cart dont have account_id if they were put in the cart when the user was not logged in
 
 		// If the cart is empty, we'll return here.
 		if (! Cart::instance()->contents()->count_all())
-			$block->add(array(
+			Block::add(array(
 				'title'=>_('Empty Cart'),
 				'body'=>_('The cart is empty')
 			));
@@ -58,7 +57,7 @@ class Controller_Checkout extends Controller_TemplateDefault {
 			}
 			$output .= '</table>';
 
-			$block->add(array(
+			Block::add(array(
 				'title'=>_('Your Items'),
 				'body'=>$output,
 			));
@@ -67,7 +66,7 @@ class Controller_Checkout extends Controller_TemplateDefault {
 				->payment_options_cart();
 
 			// @todo Country value should come from somewhere?
-			$block->add(array(
+			Block::add(array(
 				'title'=>_('Order Total'),
 				'body'=>View::factory('cart/checkout_total')
 					->set('cart',Cart::instance())
@@ -91,14 +90,12 @@ class Controller_Checkout extends Controller_TemplateDefault {
 			$output .= '</table>';
 			$output .= Form::close();
 
-			$block->add(array(
+			Block::add(array(
 				'title'=>_('Available Payment Methods'),
 				'body'=>$output,
 			));
 		}
 
-		$this->template->content = $block;
-
 		// Suppress our right hand tab
 		$this->template->right = ' ';
 	}