From ec3976314de1d9820c0de3ba3c40eeffecf16740 Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 31 Jan 2006 14:13:20 +0000 Subject: Fixed a small issue about page configuration. --- demos/personal/protected/application.xml | 4 ++-- demos/quickstart/protected/pages/Configurations/PageConfig.page | 2 +- framework/core.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/personal/protected/application.xml b/demos/personal/protected/application.xml index 28da6696..5015bab0 100644 --- a/demos/personal/protected/application.xml +++ b/demos/personal/protected/application.xml @@ -1,6 +1,6 @@ - + - + diff --git a/demos/quickstart/protected/pages/Configurations/PageConfig.page b/demos/quickstart/protected/pages/Configurations/PageConfig.page index 606d65a9..bd8a7186 100644 --- a/demos/quickstart/protected/pages/Configurations/PageConfig.page +++ b/demos/quickstart/protected/pages/Configurations/PageConfig.page @@ -5,7 +5,7 @@ Page configurations are mainly used by TPageService to modify or append the application configuration. As the name indicates, a page configuration is associated with a directory storing some page files. It is stored as an XML file named config.xml.

-When a user requests a page stored under <BasePath>/dir1/dir2, the TPageService will try to parse and load config.xml files under <BasePath>/dir1 and <BasePath>/dir1/dir2. Paths, modules, and parameters specified in these configuration files will be appended or merged into the existing application configuration. +When a user requests a page stored under <BasePath>/dir1/dir2, the TPageService will try to parse and load config.xml files under <BasePath>, <BasePath>/dir1 and <BasePath>/dir1/dir2. Paths, modules, and parameters specified in these configuration files will be appended or merged into the existing application configuration. Here <BasePath> is as defined in page service.

The format of a page configuration file is as follows, diff --git a/framework/core.php b/framework/core.php index 6c31bc55..3f5493d5 100644 --- a/framework/core.php +++ b/framework/core.php @@ -752,9 +752,9 @@ class PradoBase */ public static function trace($msg,$category='Uncategorized') { - if(self::$_application && self::$_application->getMode()==='Performance') + if(self::$_application && self::$_application->getMode()===TApplication::STATE_PERFORMANCE) return; - if(!self::$_application || self::$_application->getMode()==='Debug') + if(!self::$_application || self::$_application->getMode()===TApplication::STATE_DEBUG) { $trace=debug_backtrace(); if(isset($trace[0]['file']) && isset($trace[0]['line'])) -- cgit v1.2.3