From 94e94e0a8566f23d16658a04c55b0bbfdd6689aa Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 14 Feb 2010 01:22:57 +0000
Subject: Merge Branches & Trunk /trunk:r2680,2692,2707-2736
 /branches/3.1:r2682-2686,2694-2702,2705,2738-2762

---
 framework/TShellApplication.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'framework/TShellApplication.php')

diff --git a/framework/TShellApplication.php b/framework/TShellApplication.php
index 0d2cb826..e8560abf 100644
--- a/framework/TShellApplication.php
+++ b/framework/TShellApplication.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System
@@ -35,6 +35,14 @@
  */
 class TShellApplication extends TApplication
 {
+
+	/**
+	 * Override parent implementation. TShellApplication doesn't need to start any service
+	 */
+	public function startService($serviceID)
+	{
+
+	}
 	/**
 	 * Runs the application.
 	 * This method overrides the parent implementation by initializing
-- 
cgit v1.2.3