summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqiang.xue <>2009-05-25 00:41:03 +0000
committerqiang.xue <>2009-05-25 00:41:03 +0000
commit5a87ceb5ce3a62aae92c344f670059971d5914d9 (patch)
tree4ecc39bde810f60c3ce742e399691ee4ef0eaa92
parent21f4a4c546091fd0bd0059c8c17b89f17810492d (diff)
prepare for next release.
-rw-r--r--HISTORY2
-rw-r--r--UPGRADE9
-rw-r--r--buildscripts/texbuilder/quickstart/quickstart.tex2
-rw-r--r--framework/PradoBase.php2
-rw-r--r--index.html2
5 files changed, 11 insertions, 6 deletions
diff --git a/HISTORY b/HISTORY
index 5fdcdd25..ecf525d6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,5 @@
+Version 3.1.6 to be released
+
Version 3.1.5 May 24, 2009
BUG: Issue#55 - TPropertyAccess.get and has don't recognize magic getter __get (Yves)
BUG: Issue#68 - TSqlMapConfig::createSqlMapGateway(): assign current connection to cached TSqlMapManager to avoid loosing active transaction (Yves)
diff --git a/UPGRADE b/UPGRADE
index 3dbd63e2..eb6adbe7 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
- Upgrading Instructions for PRADO Framework v3.1.5
+ Upgrading Instructions for PRADO Framework v3.1.6
=================================================
!!!IMPORTANT!!!
@@ -9,11 +9,14 @@ if you want to upgrade from version A to version C and there is
version B between A and C, you need to following the instructions
for both A and B.
+Upgrading from v3.1.5
+---------------------
+
Upgrading from v3.1.4
---------------------
- The structure of indices used by TDbCache has been changed by replacing
PRIMARY KEY on 'itemkey' with non-unique index and adding an additional index on column 'expire'.
- Existing tables should be amended or deleted and recreated as follows:
+ Existing tables should be amended or deleted and recreated as follows:
CREATE TABLE pradocache (itemkey CHAR(128), value BLOB, expire INT)
CREATE INDEX IX_itemkey ON pradocache (itemkey)
CREATE INDEX IX_expire ON pradocache (expire)
@@ -21,7 +24,7 @@ Upgrading from v3.1.4
Upgrading from v3.1.3
---------------------
- The prado-cli and prado-cli.bat scripts have been moved into
- the framework folder of the distribution.
+ the framework folder of the distribution.
Upgrading from v3.1.2
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index b1bf467e..2d45f17a 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,7 +52,7 @@
%----------------- TITLE --------------
-\title{\Huge \bfseries PRADO v3.1.5 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.1.6 Quickstart Tutorial
\thanks{Copyright 2004-2009. All Rights Reserved.}
}
\author{Qiang Xue and Wei Zhuo}
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 37321afa..a08b54ba 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
*/
public static function getVersion()
{
- return '3.1.5';
+ return '3.1.6-dev';
}
/**
diff --git a/index.html b/index.html
index d1ce75b4..9df9e982 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
<body>
<h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.1.5, May 24, 2009<br>
+<p>Version 3.1.6 to be released<br>
Copyright&copy; 2004-2009 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
All Rights Reserved.
</p>