From eddf2ee5f340c10b84f2447ddfa8c41aab6734c0 Mon Sep 17 00:00:00 2001 From: DarkAngelBGE Date: Wed, 30 Jul 2008 14:00:36 +0000 Subject: [PATCH] conditional inclusion for ErrorHandler class in the session.test file in order to prevent the CakeSession class being redeclared when running the testsuiteshell; fixes #5092 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7382 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/tests/cases/libs/session.test.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cake/tests/cases/libs/session.test.php b/cake/tests/cases/libs/session.test.php index eb1549f0d..c5f506fe2 100644 --- a/cake/tests/cases/libs/session.test.php +++ b/cake/tests/cases/libs/session.test.php @@ -26,7 +26,9 @@ * @lastmodified $Date$ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ -App::import('Core', 'Session'); +if (!class_exists('CakeSession')) { + App::import('Core', 'Session'); +} /** * Short description for class. *