From 6dbe5b09f8a69f5df2f7ba43af20ab91e334c205 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 27 Jul 2010 23:26:24 -0400
Subject: [PATCH] Fixing failing test caused by undefined variable.

---
 cake/libs/view/helpers/session.php | 36 ++----------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index 7fac48602..08bbe9b50 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -89,21 +89,17 @@ class SessionHelper extends AppHelper {
 			$flash = CakeSession::read('Message.' . $key);
 
 			if ($flash['element'] == 'default') {
+				$class = 'message';
 				if (!empty($flash['params']['class'])) {
 					$class = $flash['params']['class'];
-				} else {
-					$tmpVars = $flash['params'];
-					$tmpVars['message'] = $flash['message'];
-					$out = $this->_View->element($flash['element'], $tmpVars);
 				}
 				$out = '<div id="' . $key . 'Message" class="' . $class . '">' . $flash['message'] . '</div>';
 			} elseif ($flash['element'] == '' || $flash['element'] == null) {
 				$out = $flash['message'];
 			} else {
-				$view =& ClassRegistry::getObject('view');
 				$tmpVars = $flash['params'];
 				$tmpVars['message'] = $flash['message'];
-				$out = $view->element($flash['element'], $tmpVars);
+				$out = $this->_View->element($flash['element'], $tmpVars);
 			}
 			CakeSession::delete('Message.' . $key);
 		}
@@ -118,32 +114,4 @@ class SessionHelper extends AppHelper {
 	public function valid() {
 		return CakeSession::valid();
 	}
-
-/**
- * stub method to make helper less complainey
- *
- * @return void
- */
-	public function beforeRender() { }
-
-/**
- * stub method to make helper less complainey
- *
- * @return void
- */
-	public function beforeLayout() { }
-
-/**
- * stub method to make helper less complainey
- *
- * @return void
- */
-	public function afterRender() { }
-
-/**
- * stub method to make helper less complainey
- *
- * @return void
- */
-	public function afterLayout() { }
 }