From 618293517861b69334cd470068199394120cd20a Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 30 Jun 2006 18:41:56 +0000
Subject: Merge from 3.0 branch till 1218.
---
framework/Exceptions/TErrorHandler.php | 2 +-
framework/Exceptions/messages.txt | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'framework/Exceptions')
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php
index 25f421e3..e18de7ab 100644
--- a/framework/Exceptions/TErrorHandler.php
+++ b/framework/Exceptions/TErrorHandler.php
@@ -42,7 +42,7 @@
* by the application object to handle errors.
*
* TErrorHandler may be configured in application configuration file as follows
- *
+ *
*
* @author Qiang Xue
* @version $Revision: $ $Date: $
diff --git a/framework/Exceptions/messages.txt b/framework/Exceptions/messages.txt
index 38541fed..22b28a42 100644
--- a/framework/Exceptions/messages.txt
+++ b/framework/Exceptions/messages.txt
@@ -144,7 +144,9 @@ authmanager_usermanager_invalid = TAuthManager.UserManager '{0}' does not refe
authmanager_usermanager_unchangeable = TAuthManager.UserManager cannot be modified after the module is initialized.
authmanager_session_required = TAuthManager requires a session application module.
-thememanager_basepath_invalid = TThemeManager.BasePath '{0}' is not a valid directory.
+thememanager_service_unavailable = TThemeManager requires TPageService to be available. This error often occurs when you configure TThemeManager outside of the page service configuration.
+thememanager_basepath_invalid = TThemeManager.BasePath '{0}' is not a valid path alias. Make sure you have defined this alias in configuration and it points to a valid directory.
+thememanager_basepath_invalid2 = TThemeManager.BasePath '{0}' is not a valid directory.
thememanager_basepath_unchangeable = TThemeManager.BasePath cannot be modified after the module is initialized.
theme_baseurl_required = TThemeManager.BasePath is required. By default, a directory named 'themes' under the directory containing the application entry script is assumed.
--
cgit v1.2.3