From c6b4190fab88201f4efaa0d00a6aa823b180f482 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 10 Jun 2006 11:28:30 +0000
Subject: Merge from 3.0 branch till 1148.

---
 demos/quickstart/protected/comments/CommentList.php       | 1 -
 demos/quickstart/protected/pages/Controls/NewControl.page | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'demos/quickstart')

diff --git a/demos/quickstart/protected/comments/CommentList.php b/demos/quickstart/protected/comments/CommentList.php
index 4328991f..3bfb7239 100644
--- a/demos/quickstart/protected/comments/CommentList.php
+++ b/demos/quickstart/protected/comments/CommentList.php
@@ -43,7 +43,6 @@ class CommentList extends TTemplateControl
 		$this->_quickstart->addNewComment($page, 
 			$this->email->getText(), $this->content->getText());
 		$this->multiView1->setActiveViewIndex(1);
-		$this->listComments($page);
 	}
 	
 	public function setVisible($value)
diff --git a/demos/quickstart/protected/pages/Controls/NewControl.page b/demos/quickstart/protected/pages/Controls/NewControl.page
index c2640a33..54465ff7 100644
--- a/demos/quickstart/protected/pages/Controls/NewControl.page
+++ b/demos/quickstart/protected/pages/Controls/NewControl.page
@@ -122,7 +122,7 @@ Other important properties and methods include:
   <li><tt>Attributes</tt> - collection of custom attributes. This is useful for allowing users to specify attributes of the output HTML elements that are not covered by control properties.</li>
   <li><tt>getViewState()</tt> and <tt>setViewState()</tt> - these methods are commonly used for defining properties that are stored in viewstate.</li>
   <li><tt>saveState()</tt> and <tt>loadState()</tt> - these two methods can be overriden to provide last step state saving and loading.</li>
-  <li>Control lifecycles - Life page lifecycles, controls also have lifecycles. Each control undergoes the following lifecycles in order: constructor, <tt>onInit()</tt>, <tt>onLoad()</tt>, <tt>onPreRender()</tt>, <tt>render()</tt>, and <tt>onUnload</tt>. More details can be found in the <a href="?page=Fundamentals.Pages">page</a> section.</li>
+  <li>Control lifecycles - Like pages, controls also have lifecycles. Each control undergoes the following lifecycles in order: constructor, <tt>onInit()</tt>, <tt>onLoad()</tt>, <tt>onPreRender()</tt>, <tt>render()</tt>, and <tt>onUnload</tt>. More details can be found in the <a href="?page=Fundamentals.Pages">page</a> section.</li>
 </ul>
 
 <h3 id="5408">Extending <tt>TWebControl</tt></h3>
-- 
cgit v1.2.3