From 61c2c3009da201224a943b63bf80155dfd32d224 Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Thu, 23 Jul 2009 13:07:03 -0700
Subject: [PATCH] updating session requires and removing deperacted method from
 text helper

---
 cake/libs/cake_session.php         |  2 +-
 cake/libs/view/helpers/session.php |  3 +--
 cake/libs/view/helpers/text.php    | 20 --------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
index f9b990e21..03bc1eeba 100644
--- a/cake/libs/cake_session.php
+++ b/cake/libs/cake_session.php
@@ -502,7 +502,7 @@ class CakeSession extends Object {
 			case 'cache':
 				if (empty($_SESSION)) {
 					if (!class_exists('Cache')) {
-						uses('Cache');
+						require LIBS . 'cache.php';
 					}
 					if ($iniSet) {
 						ini_set('session.use_trans_sid', 0);
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index d78170ab1..17e7ba9db 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -25,9 +25,8 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 if (!class_exists('cakesession')) {
-	uses('session');
+	require LIBS . 'cake_session.php';
 }
-
 /**
  * Session Helper.
  *
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index a3ae2bee4..542b55537 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -320,25 +320,5 @@ class TextHelper extends AppHelper {
 		}
 		return $r;
 	}
-/**
- * Text-to-html parser, similar to Textile or RedCloth, only with a little different syntax.
- *
- * @param string $text String to "flay"
- * @param boolean $allowHtml Set to true if if html is allowed
- * @return string "Flayed" text
- * @access public
- * @todo Change this. We need a real Textile parser.
- * @codeCoverageIgnoreStart
- */
-	function flay($text, $allowHtml = false) {
-		trigger_error(__('(TextHelper::flay) Deprecated: the Flay library is no longer supported and will be removed in a future version.', true), E_USER_WARNING);
-		if (!class_exists('Flay')) {
-			uses('flay');
-		}
-		return Flay::toHtml($text, false, $allowHtml);
-	}
-/**
- * @codeCoverageIgnoreEnd
- */
 }
 ?>
\ No newline at end of file