summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2006-01-31 14:13:20 +0000
committerxue <>2006-01-31 14:13:20 +0000
commitec3976314de1d9820c0de3ba3c40eeffecf16740 (patch)
treebe82e6c4bb0be13dda99ec581d7715365d4284cc
parent4ad011e6ff366a924c09bb58518c01d3a6361e54 (diff)
Fixed a small issue about page configuration.
-rw-r--r--demos/personal/protected/application.xml4
-rw-r--r--demos/quickstart/protected/pages/Configurations/PageConfig.page2
-rw-r--r--framework/core.php4
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<application>
+<application mode="Debug">
<!-- modules configured and loaded for all services -->
<modules>
<!-- Remove this comment mark to enable caching
@@ -8,7 +8,7 @@
-->
<module id="session" class="THttpSession" />
<module id="log" class="System.Log.TLogRouter">
- <route class="TBrowserLogRoute" Categories="System.TApplication,System.Web.UI.TPage" />
+ <route class="TBrowserLogRoute" Categories="System.Web.UI.TPage" />
<route class="TFileLogRoute" Categories="System" Levels="Notice,Warning,Error,Alert,Fatal" />
</module>
</modules>
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 <tt>TPageService</tt> 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 <tt>config.xml</tt>.
</p>
<p>
-When a user requests a page stored under <tt>&lt;BasePath&gt;/dir1/dir2</tt>, the <tt>TPageService</tt> will try to parse and load <tt>config.xml</tt> files under <tt>&lt;BasePath&gt;/dir1</tt> and <tt>&lt;BasePath&gt;/dir1/dir2</tt>. 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 <tt>&lt;BasePath&gt;/dir1/dir2</tt>, the <tt>TPageService</tt> will try to parse and load <tt>config.xml</tt> files under <tt>&lt;BasePath&gt;</tt>, <tt>&lt;BasePath&gt;/dir1</tt> and <tt>&lt;BasePath&gt;/dir1/dir2</tt>. Paths, modules, and parameters specified in these configuration files will be appended or merged into the existing application configuration. Here <tt>&lt;BasePath&gt;</tt> is as defined in <a href="?page=Fundamentals.Services">page service</a>.
</p>
<p>
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']))