merge from 3.0 branch till 1740.

3 files changed, 3 insertions, 3 deletions

diff --git a/demos/quickstart/protected/pages/Advanced/Security.page b/demos/quickstart/protected/pages/Advanced/Security.page
index a515bd0a..7aaab552 100644
--- a/demos/quickstart/protected/pages/Advanced/Security.page
+++ b/demos/quickstart/protected/pages/Advanced/Security.page
@@ -47,7 +47,7 @@ There are several countermeasures to prevent cookies from being attacked.
 <ul id="u1" class="block-content">

   <li>An application can use SSL to create a secure communication channel and only pass the authentication cookie over an HTTPS connection. Attackers are thus unable to decipher the contents in the transferred cookies.</li>

   <li>Expire sessions appropriately, including all cookies and session tokens, to reduce the likelihood of being attacked.</li>

-  <li>Prevent <a href="?page=Security.XSS">cross-site scripting (XSS)</a> which causes arbitrary code to run in a user's browser and expose his cookies.</li>

+  <li>Prevent cross-site scripting (XSS) which causes arbitrary code to run in a user's browser and expose his cookies.</li>

   <li>Validate cookie data and detect if they are altered.</li>

 </ul>

 <p id="730573" class="block-content">

diff --git a/demos/quickstart/protected/pages/Controls/NewControl.page b/demos/quickstart/protected/pages/Controls/NewControl.page
index f521ffd7..9981dd56 100644
--- a/demos/quickstart/protected/pages/Controls/NewControl.page
+++ b/demos/quickstart/protected/pages/Controls/NewControl.page
@@ -57,7 +57,7 @@ Complete code for <tt>LabeledTextBox</tt> is shown as follows,
 class LabeledTextBox extends TCompositeControl {

     private $_label;

     private $_textbox;

-    protected function createChildControls() {

+    public function createChildControls() {

         $this->_label=new TLabel;

         $this->_label->setID('Label');

         // add the label as a child of LabeledTextBox

diff --git a/demos/quickstart/protected/pages/Controls/Standard.page b/demos/quickstart/protected/pages/Controls/Standard.page
index 6fe7533f..88bac309 100644
--- a/demos/quickstart/protected/pages/Controls/Standard.page
+++ b/demos/quickstart/protected/pages/Controls/Standard.page
@@ -104,7 +104,7 @@
   </li>

 

   <li>

-  <a href="?page=Controls.SafeHtml">TSafeHtml</a> displays its body content with assurance that the content contain no harmful code (such as <a href="?page=Security.XSS">XSS</a>).

+  <a href="?page=Controls.SafeHtml">TSafeHtml</a> displays its body content with assurance that the content contain no harmful code (such as <a href="?page=Advanced.Security">XSS</a>).

   </li>

 

   <li>