From 698affb2df2750c9727d718b8ad0c9bab4cd9794 Mon Sep 17 00:00:00 2001
From: ctrlaltca <>
Date: Mon, 9 Jul 2012 07:30:31 +0000
Subject: fix #415

---
 HISTORY                 |  1 +
 framework/prado-cli.php | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 71c97fa8..ea5fe089 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@ Version 3.2.1 to be released
 BUG: Issue #412 - open_basedir restriction (ctrlaltca)
 BUG: Issue #413 - TActiveDatePicker does not fire TCallbackClientSide's events (ctrlaltca)
 BUG: Issue #414 - ActiveDatagrid's pager does not fire TCallbackClientSide's events (ctrlaltca)
+BUG: Issue #415 - prado-cli throws an error if the application is making use of THttpSession (ctrlaltca)
 
 Version 3.2.0 Jun 25, 2012
 BUG: Fixed an inconsistency in TRegularExpressionValidator
diff --git a/framework/prado-cli.php b/framework/prado-cli.php
index 25df7976..a2930b42 100755
--- a/framework/prado-cli.php
+++ b/framework/prado-cli.php
@@ -85,14 +85,17 @@ class PradoCommandLineInterpreter
 		return $instance;
 	}
 
+	public static function printGreeting()
+	{
+		echo "Command line tools for Prado ".Prado::getVersion().".\n";
+	}
+
 	/**
 	 * Dispatch the command line actions.
 	 * @param array command line arguments
 	 */
 	public function run($args)
 	{
-		echo "Command line tools for Prado ".Prado::getVersion().".\n";
-
 		if(count($args) > 1)
 			array_shift($args);
 		$valid = false;
@@ -117,6 +120,8 @@ class PradoCommandLineInterpreter
 	 */
 	public function printHelp()
 	{
+		PradoCommandLineInterpreter::printGreeting();
+
 		echo "usage: php prado-cli.php action <parameter> [optional]\n";
 		echo "example: php prado-cli.php -c mysite\n\n";
 		echo "actions:\n";
@@ -198,6 +203,7 @@ EOD;
 				$app->run();
 				$dir = substr(str_replace(realpath('./'),'',$app_dir),1);
 				$initialized=true;
+				PradoCommandLineInterpreter::printGreeting();
 				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
 			}
 
@@ -205,6 +211,7 @@ EOD;
 		}
 		else
 		{
+			PradoCommandLineInterpreter::printGreeting();
 			echo '+'.str_repeat('-',77)."+\n";
 			echo '** Unable to load PRADO application in directory "'.$directory."\".\n";
 			echo '+'.str_repeat('-',77)."+\n";
@@ -230,6 +237,7 @@ class PradoCommandLineCreateProject extends PradoCommandLineAction
 
 	public function performAction($args)
 	{
+		PradoCommandLineInterpreter::printGreeting();
 		$this->createNewPradoProject($args[1]);
 		return true;
 	}
@@ -381,6 +389,7 @@ class PradoCommandLineCreateTests extends PradoCommandLineAction
 
 	public function performAction($args)
 	{
+		PradoCommandLineInterpreter::printGreeting();
 		$this->createTestFixtures($args[1]);
 		return true;
 	}
@@ -870,5 +879,3 @@ if(class_exists('PHP_Shell_Commands', false))
 
 	include_once(dirname(__FILE__).'/3rdParty/PhpShell/php-shell-cmd.php');
 }
-
-?>
-- 
cgit v1.2.3