Merge from 3.0 branch till 1079.

2 files changed, 2 insertions, 1 deletions

diff --git a/demos/quickstart/protected/controls/Layout.php b/demos/quickstart/protected/controls/Layout.php
index d58cabfa..7c2cbd85 100644
--- a/demos/quickstart/protected/controls/Layout.php
+++ b/demos/quickstart/protected/controls/Layout.php
@@ -16,7 +16,7 @@ class Layout extends TTemplateControl
 		if(strpos($url,'?')===false)

 			$url.='?notheme=true';

 		else

-			$url.='&notheme=true';

+			$url.='&notheme=true';

 		$this->PrinterLink->NavigateUrl=$url;

 

 		if(isset($this->Request['notheme']))

diff --git a/demos/quickstart/protected/controls/TopicList.tpl b/demos/quickstart/protected/controls/TopicList.tpl
index 5ffc7098..f26b75a6 100644
--- a/demos/quickstart/protected/controls/TopicList.tpl
+++ b/demos/quickstart/protected/controls/TopicList.tpl
@@ -64,6 +64,7 @@
 <div class="topic">

 <div>Avanced Topics</div>

 <ul>

+	<li><a href="?page=Advanced.Collections">Collections</a></li>

     <li><a href="?page=Advanced.Auth">Authentication and Authorization</a></li>

     <li><a href="?page=Advanced.Security">Security</a></li>

     <li><a href="?page=Advanced.Scripts">Client-side Scripting</a></li>