From 0d42be79b9dfeaa7686fb7da11920af4eb0561d7 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 3 Dec 2005 04:42:14 +0000
Subject:

---
 framework/Exceptions/TErrorHandler.php | 3 +--
 framework/Exceptions/messages.txt      | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'framework/Exceptions')

diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 8af92ecc..e9f48a2b 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -67,7 +67,7 @@ class TErrorHandler extends TComponent implements IModule
 	/**
 	 * @var string module ID
 	 */
-	private $_id;
+	private $_id='error';
 	/**
 	 * @var TApplication application instance
 	 */
@@ -86,7 +86,6 @@ class TErrorHandler extends TComponent implements IModule
 	public function init($application,$config)
 	{
 		$this->_application=$application;
-		$application->attachEventHandler('Error',array($this,'handleError'));
 		$application->setErrorHandler($this);
 	}
 
diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt
index 4c6a4c87..8a20b0c0 100644
--- a/framework/Exceptions/messages.txt
+++ b/framework/Exceptions/messages.txt
@@ -34,9 +34,9 @@ appconfig_alias_invalid					= Application configuration <alias> element must hav
 appconfig_alias_redefined				= Application configuration <alias id="%s"> cannot be redefined.
 appconfig_using_invalid					= Application configuration <using> element must have a "namespace" attribute.
 appconfig_moduleid_required				= Application configuration <module> element must have an "id" attribute.
-appconfig_moduletype_required			= Application configuration <module id="%s"> must have a "type" attribute.
+appconfig_moduletype_required			= Application configuration <module id="%s"> must have a "class" attribute.
 appconfig_serviceid_required			= Application configuration <service> element must have an "id" attribute.
-appconfig_servicetype_required			= Application configuration <service id="%s"> must have a "type" attribute.
+appconfig_servicetype_required			= Application configuration <service id="%s"> must have a "class" attribute.
 appconfig_parameterid_required			= Application configuration <parameter> element must have an "id" attribute.
 
 uri_format_invalid						= '%s' is not a valid URI.
@@ -86,9 +86,9 @@ pageserviceconf_aliaspath_invalid		= <alias id="%s"> uses an invalid file path "
 pageserviceconf_alias_invalid			= <alias> element must have an "id" attribute and a "path" attribute in page directory configuration file '%s'.
 pageserviceconf_using_invalid			= <using> element must have a "namespace" attribute in page directory configuration file '%s'.
 pageserviceconf_module_invalid			= <module> element must have an "id" attribute in page directory configuration file '%s'.
-pageserviceconf_moduletype_required		= <module id="%s"> must have a "type" attribute in page directory configuration file '%s'.
+pageserviceconf_moduletype_required		= <module id="%s"> must have a "class" attribute in page directory configuration file '%s'.
 pageserviceconf_parameter_invalid		= <parameter> element must have an "id" attribute in page directory configuration file '%s'.
-pageserviceconf_page_invalid			= <page> element must have an "id" attribute and a "type" attribute in page directory configuration file '%s'.
+pageserviceconf_page_invalid			= <page> element must have an "id" attribute and a "class" attribute in page directory configuration file '%s'.
 
 template_templatefile_invalid			= Template file '%s' cannot open.
 template_closingtag_unexpected			= %s: Unexpected closing tag '%s' is found.
-- 
cgit v1.2.3