summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2005-11-15 20:51:34 +0000
committerxue <>2005-11-15 20:51:34 +0000
commit08b5405ef570d97726953e5679f27980ce0b0d98 (patch)
tree8ac95e1fbdefeab48d3bb2c9258907dd2944ad9f
parent2ed19f8d883a72768d07304ec1b6205762801287 (diff)
tested Master/Content.
-rw-r--r--demos/controls/protected/application.xml1
-rw-r--r--demos/controls/protected/pages/HomePage.tpl5
-rw-r--r--framework/TApplication.php2
3 files changed, 6 insertions, 2 deletions
diff --git a/demos/controls/protected/application.xml b/demos/controls/protected/application.xml
index 3b9f749d..a9d0d922 100644
--- a/demos/controls/protected/application.xml
+++ b/demos/controls/protected/application.xml
@@ -3,6 +3,7 @@
<configuration>
<paths>
<alias id="Demo" path="." />
+ <alias id="Pages" path="pages" />
</paths>
<!-- modules configured and loaded for all services -->
<modules>
diff --git a/demos/controls/protected/pages/HomePage.tpl b/demos/controls/protected/pages/HomePage.tpl
index 7774882e..66fd9e71 100644
--- a/demos/controls/protected/pages/HomePage.tpl
+++ b/demos/controls/protected/pages/HomePage.tpl
@@ -1,3 +1,5 @@
+<%@ MasterClass="Pages.master.MasterPage" %>
+<com:TContent id="header" >
<com:TForm>
<h1>Welcome! <%=$this->User->Name %></h1>
<com:TLiteral Text="literal" />
@@ -9,4 +11,5 @@
<com:TImageButton ImageUrl=<%~/fungii_logo.gif %> /><br/>
<com:THyperLink Text="Visit a 'classless' page" NavigateUrl="?sp=page.plain" /> |
<com:THyperLink Text="Visit member only page" NavigateUrl="?sp=page.private.member" />
-</com:TForm> \ No newline at end of file
+</com:TForm>
+</com:TContent> \ No newline at end of file
diff --git a/framework/TApplication.php b/framework/TApplication.php
index 70b6a9ff..f1a7d316 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -637,7 +637,7 @@ class TApplicationConfiguration extends TComponent
if(($id=$aliasNode->getAttribute('id'))!==null && ($path=$aliasNode->getAttribute('path'))!==null)
{
$path=str_replace('\\','/',$path);
- if(preg_match('/^\\/|.:\\//',$path)) // if absolute path
+ if(preg_match('/^\\/|.:\\/|.:\\\\/',$path)) // if absolute path
$p=realpath($path);
else
$p=realpath($configPath.'/'.$path);