merge from 3.0 branch till 1508.

3 files changed, 10 insertions, 9 deletions

diff --git a/demos/quickstart/protected/controls/SearchBox.php b/demos/quickstart/protected/controls/SearchBox.php
index b579cd91..6fb8e376 100644
--- a/demos/quickstart/protected/controls/SearchBox.php
+++ b/demos/quickstart/protected/controls/SearchBox.php
@@ -1,25 +1,25 @@
 <?php

 

-class SearchBox extends TTemplateControl 

+class SearchBox extends TTemplateControl

 {

-	public function getText() 

+	public function getText()

 	{

         $this->ensureChildControls();

         return $this->getRegisteredObject('search')->getText();

     }

-    

+

     public function getTextBox()

     {

         $this->ensureChildControls();

         return $this->getRegisteredObject('search');

     }

-	

+

 	public function getButton()

 	{

 		$this->ensureChildControls();

         return $this->getRegisteredObject('find');

 	}

-	

+

 	public function onInit($param)

 	{

 		parent::onInit($param);

@@ -32,7 +32,7 @@ class SearchBox extends TTemplateControl
 		if(strlen($query = $this->search->getText()) >0)

 		{

 			$ps = $this->getApplication()->getPageService();

-			$page = $ps->constructUrl('Search', array('q' => $query));			

+			$page = $ps->constructUrl('Search', array('q' => $query), false);

 			$this->getApplication()->getResponse()->redirect($page);

 		}

 	}

diff --git a/demos/quickstart/protected/pages/Controls/Repeater.page b/demos/quickstart/protected/pages/Controls/Repeater.page
index d8f3fd0a..3534c603 100644
--- a/demos/quickstart/protected/pages/Controls/Repeater.page
+++ b/demos/quickstart/protected/pages/Controls/Repeater.page
@@ -19,7 +19,7 @@ To populate data into the repeater items, set <tt>DataSource</tt> to a valid dat
 </p>

 <com:TTextHighlighter Language="php" CssClass="source">

 class MyPage extends TPage {

-    protected function onLoad($param) {

+    public function onLoad($param) {

         parent::onLoad($param);

         if(!$this->IsPostBack) {

             $this->Repeater->DataSource=$data;

diff --git a/demos/quickstart/protected/pages/GettingStarted/Introduction.page b/demos/quickstart/protected/pages/GettingStarted/Introduction.page
index e52f4acf..52b7d9af 100644
--- a/demos/quickstart/protected/pages/GettingStarted/Introduction.page
+++ b/demos/quickstart/protected/pages/GettingStarted/Introduction.page
@@ -1,16 +1,17 @@
 <com:TContent ID="body" >

 <h1 id="101">Welcome to the PRADO Quickstart Tutorial</h1>

 <p>

-This Quickstart tutorial is provided to help you quickly start building your own Web applications based on PRADO version 3.0.

+This Quickstart tutorial is provided to help you quickly start building your own Web applications based on PRADO version 3.x.

 </p>

 <p>

 You may refer to the following resources if you find this tutorial does not fulfill all your needs.

 </p>

 <ul>

+  <li><a href="http://www.pradosoft.com/docs/classdoc/">PRADO Classes</a></li>

   <li><a href="http://www.pradosoft.com/docs/manual/">PRADO API Documentation</a></li>

   <li><a href="http://www.pradosoft.com/forum/">PRADO Forum</a></li>

   <li><a href="http://www.pradosoft.com/wiki/">PRADO Wiki</a></li>

-  <li><a href="http://trac.pradosoft.com/wiki/">PRADO Trac</a></li>

+  <li><a href="http://trac.pradosoft.com/prado/">PRADO Trac</a></li>

 </ul>

 

 </com:TContent>
\ No newline at end of file