From 8978869afd5cb31cc210f79eee6ecedbe8c47333 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 23 Aug 2016 12:37:19 +0200
Subject: Prepare release 3.3.2

---
 HISTORY                                           |  2 +-
 README.md                                         | 12 +++++++-----
 build.xml                                         |  2 +-
 buildscripts/texbuilder/quickstart/quickstart.tex |  2 +-
 composer.json                                     |  2 +-
 demos/site/protected/Pages/Home.page              | 14 ++++++++++----
 framework/PradoBase.php                           |  2 +-
 framework/Web/Javascripts/source/prado/prado.js   |  2 +-
 framework/pradolite.php                           | 17 +++++++----------
 index.html                                        |  3 ++-
 10 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/HISTORY b/HISTORY
index 4d011600..2a172466 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,4 @@
-Version 3.3.2 xxx, 2016
+Version 3.3.2 August 23, 2016
 
 BUG: Issue #592 - Fix TActiveMultiView broken on 3.3.1 (ctrlaltca)
 BUG: Issue #588 - Fix reading values of controls inside TJuiDialog (ctrlaltca)
diff --git a/README.md b/README.md
index d84076fc..0b3b43a7 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ The Demos folder has several different example prado applications. You can see m
 * northwind-db
 * personal
 * quickstart
+* site
 * soap
 * sqlmap
 * time-tracker
@@ -70,7 +71,7 @@ Buildfile: /yourcodepath/build.xml
 
 prado > help:
 
-     [echo]
+     [echo] 
 
     Welcome to use PRADO build script!
     ----------------------------------
@@ -81,10 +82,11 @@ prado > help:
     where <target name> can be one of the following:
 
     For all PRADO developers:
-    - test       : run unit tests (results are under /build/test-reports)
-    - coverage   : run unit tests collecting coverage informations
-    - lint       : run lint on framework
-    - lint-demos : run lint on demos
+    - test           : run unit tests (results are under /build/test-reports)
+    - coverage       : run unit tests collecting coverage informations
+    - functionaltest : run funcitonal tests (requires Selenium Server)
+    - lint           : run lint on framework
+    - lint-demos     : run lint on demos
 ```
 
 
diff --git a/build.xml b/build.xml
index 9b83ba26..768b4591 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  PRADO 3.3 build file - Copyright (C) 2015 The PRADO Group
+  PRADO 3.3 build file - Copyright (C) 2016 The PRADO Group
 
   Requirements
   ============
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 8cb8a059..aa42e13a 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,7 +52,7 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.3.1 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.3.2 Quickstart Tutorial
     \thanks{Copyright 2004-2016. All Rights Reserved.}
 }
 \author{Qiang Xue, Wei Zhuo and Fabio Bas}
diff --git a/composer.json b/composer.json
index 5b429a16..86501e85 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
 		"satooshi/php-coveralls": "dev-master"
 	},
 	"provide" : {
-		"pradosoft/prado" : "3.3.1"
+		"pradosoft/prado" : "3.3.2"
 	},
 	"suggest" : {
 		"ext-apc" : "*",
diff --git a/demos/site/protected/Pages/Home.page b/demos/site/protected/Pages/Home.page
index 7e7a7abf..6c69ffe8 100755
--- a/demos/site/protected/Pages/Home.page
+++ b/demos/site/protected/Pages/Home.page
@@ -36,28 +36,34 @@
   <h2>Latest News</h2>
   <div id="articles">
 
+    <div class="article">
+      <h3>Prado 3.3.2 is released</h3>
+      <span class="date">August 23, 2016</span>
+      <p>The PRADO Group is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.2</span>.<br><br>Release 3.3.2 is a bugfix release, and doesn't introduce any backward incompatible change. Please have a look at the full <a href="https://raw.githubusercontent.com/pradosoft/prado/master/HISTORY">changelog</a> for more informations.<br><br>As usual, if you find a problem, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it.<br><br>Happy summer!<br><br>The PRADO Group
+    </div>
+
     <div class="article">
       <h3>Prado 3.3.1 is released</h3>
       <span class="date">April 19, 2016</span>
-      <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.1</span>.<br><br>Release 3.3.1 is a bugfix release for the recently released 3.3 "jQuery" PRADO branch. A few problems popped up on the new jQuery based controls, and they've been fixed. We also reworked a bit the way class autoloading works to make PRADO more friendly with 3rdparty libraries. Another area of improvement is error handling on fatal errors and a more developer friendly error reporting when using AJAX. More changes happened under the hood, please have a look at the full <a href="https://raw.githubusercontent.com/pradosoft/prado/master/HISTORY">changelog</a> for more informations.<br><br>As usual, if you find a problem, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it.<br><br>Have a good time coding!<br><br>The PRADO Group
+      <p>The PRADO Group is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.1</span>.<br><br>Release 3.3.1 is a bugfix release for the recently released 3.3 "jQuery" PRADO branch. A few problems popped up on the new jQuery based controls, and they've been fixed. We also reworked a bit the way class autoloading works to make PRADO more friendly with 3rdparty libraries. Another area of improvement is error handling on fatal errors and a more developer friendly error reporting when using AJAX. More changes happened under the hood, please have a look at the full <a href="https://raw.githubusercontent.com/pradosoft/prado/master/HISTORY">changelog</a> for more informations.<br><br>As usual, if you find a problem, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it.<br><br>Have a good time coding!<br><br>The PRADO Group
     </div>
 
     <div class="article">
       <h3>Prado 3.3.0 is released</h3>
       <span class="date">February 15, 2016</span>
-      <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.0</span>.<br><br>Release 3.3.0 is the very first PRADO release to introduce jQuery is the javascript framework of choice. Our first directive is to modernize the framework while keeping old code working, so all the existing PRADO controls have already been ported, and prototype is still included to provide backward compatibility for custom controls. Anyway, updating custom controls is probably a good idea. Have a look at the <a href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Upgrading32">Upgrading from v3.2</a> page in the Quickstart tutorial for more informations.<br><br>For any issue, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it in the next version.<br><br>Happy coding!<br><br>The PRADO Group
+      <p>The PRADO Group is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.3.0</span>.<br><br>Release 3.3.0 is the very first PRADO release to introduce jQuery is the javascript framework of choice. Our first directive is to modernize the framework while keeping old code working, so all the existing PRADO controls have already been ported, and prototype is still included to provide backward compatibility for custom controls. Anyway, updating custom controls is probably a good idea. Have a look at the <a href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Upgrading32">Upgrading from v3.2</a> page in the Quickstart tutorial for more informations.<br><br>For any issue, please <a href="https://github.com/pradosoft/prado/issues/new">report it</a> so that we can fix it in the next version.<br><br>Happy coding!<br><br>The PRADO Group
     </div>
 
     <div class="article">
       <h3>Site outage</h3>
       <span class="date">November 5, 2015</span>
-      <p>As you may have noticed, in the last few days the PRADO website has been unavailable. Unfortunately the server hosting the website suddently died, resulting in the website being unaccessible. A new server has been put in place, and we are now recovering the website data from the last backups. The website is planned to be fully working in a few days. In the meanwhile, you can always refer to our <a target="_blank" href="https://github.com/pradosoft/prado" class="bb-url">github project site</a>.<br><br>Thank you for your patience,<br><br>The PRADO Team</p>
+      <p>As you may have noticed, in the last few days the PRADO website has been unavailable. Unfortunately the server hosting the website suddently died, resulting in the website being unaccessible. A new server has been put in place, and we are now recovering the website data from the last backups. The website is planned to be fully working in a few days. In the meanwhile, you can always refer to our <a target="_blank" href="https://github.com/pradosoft/prado" class="bb-url">github project site</a>.<br><br>Thank you for your patience,<br><br>The PRADO Group</p>
     </div>
     
     <div class="article">
       <h3>Prado 3.2.4 is released</h3>
       <span class="date">August 26, 2014</span>
-      <p>The PRADO Team is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.2.4</span>.<br><br>This release backports a number of significative bugfixes and changes from the master branch where the new, jQuery-based Prado is been developed.<br>This release officially introduces <a target="_blank" href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Wsat" class="bb-url">Wsat</a>, an useful tool coded by DarthDaniel that can help out generating Active Record classes.<br><br>This release should be an easy plug-in update from previous 3.2.x Prado versions, without any backwards-compatibility issue; anyway, if you find any problem feel free&nbsp; to report it, and we'll take care of sorting it out.<br><br>Finally, some words on the current development.<br>We have some new members helping out the development: welcome in Daniel and David! Many thanks goes to them and also to all the others that have reported issues and fixes on the project's <a target="_blank" href="https://github.com/pradosoft/prado" class="bb-url">github pages</a>.<br><br>Enjoy!<br><br>The PRADO Team</p>
+      <p>The PRADO Group is proud to announce the formal release of <span style="font-weight:bold">PRADO 3.2.4</span>.<br><br>This release backports a number of significative bugfixes and changes from the master branch where the new, jQuery-based Prado is been developed.<br>This release officially introduces <a target="_blank" href="http://www.pradoframework.net/demos/quickstart/?page=GettingStarted.Wsat" class="bb-url">Wsat</a>, an useful tool coded by DarthDaniel that can help out generating Active Record classes.<br><br>This release should be an easy plug-in update from previous 3.2.x Prado versions, without any backwards-compatibility issue; anyway, if you find any problem feel free&nbsp; to report it, and we'll take care of sorting it out.<br><br>Finally, some words on the current development.<br>We have some new members helping out the development: welcome in Daniel and David! Many thanks goes to them and also to all the others that have reported issues and fixes on the project's <a target="_blank" href="https://github.com/pradosoft/prado" class="bb-url">github pages</a>.<br><br>Enjoy!<br><br>The PRADO Group</p>
     </div>
     
   </div>
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 34f8bf0f..f6c0312f 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -69,7 +69,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.3.1';
+		return '3.3.2';
 	}
 
 	/**
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 3778903e..20005377 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -271,7 +271,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.3.1',
+	Version: '3.3.2',
 
 	/**
 	 * Registry for Prado components
diff --git a/framework/pradolite.php b/framework/pradolite.php
index 6b514845..2c12c05f 100644
--- a/framework/pradolite.php
+++ b/framework/pradolite.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * File Name: pradolite.php
- * Last Update: 2016/06/08 16:06:00
+ * Last Update: 2016/08/23 12:36:39
  * Generated By: buildscripts/phpbuilder/build.php
  *
  * This file is used in lieu of prado.php to boost PRADO application performance.
@@ -25,7 +25,7 @@ class PradoBase
 	protected static $classExists = array();
 	public static function getVersion()
 	{
-		return '3.3.1';
+		return '3.3.2';
 	}
 	public static function initErrorHandlers()
 	{
@@ -4825,10 +4825,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 		if($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
-			if($value===$defaultValue)
-				unset($this->_viewState[$key]);
-			else
-				$this->_viewState[$key]=$value;
+			$this->_viewState[$key]=$value;
 		}
 		else
 		{
@@ -10304,10 +10301,10 @@ class TGlobalization extends TModule
 						$config['cache']);
 				chmod($config['cache'], PRADO_CHMOD); 			}
 		}
-        else
-        {
-            unset($config['cache']);
-        }
+		else
+		{
+			unset($config['cache']);
+		}
 		$this->_translation = $config;
 	}
 	public function getTranslationCatalogue()
diff --git a/index.html b/index.html
index fa869d07..8035d0fe 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.3.1<br>
+<p>Version 3.3.2<br>
 Copyright&copy; 2004-2016 by <a href="https://github.com/pradosoft">The PRADO Group</a><br>
 All Rights Reserved.
 </p>
@@ -57,6 +57,7 @@ After downloading the latest PRADO release file, unpack it to a Web-accessible d
   <li><a href="demos/composer/index.php">PRADO Component Writer</a></li>
   <li><a href="demos/chat/index.php">Chat</a> (requires php_pdo and php_pdo_sqlite extensions)</li>
   <li><a href="demos/currency-converter/index.php">Currency Converter</a></li>
+  <li><a href="demos/site/index.php">Prado Website</a></li>
   <li><a href="demos/soap/index.php">SOAP</a> (requires php_soap extension)</li>
   <li><a href="demos/personal/index.php">Personal Website</a></li>
   <li><a href="demos/address-book/index.php">Flex Addressbook</a> (requires php_soap, php_pdo and php_pdo_sqlite extensions)</li>
-- 
cgit v1.2.3