diff options
| author | xue <> | 2007-10-01 00:33:28 +0000 |
|---|---|---|
| committer | xue <> | 2007-10-01 00:33:28 +0000 |
| commit | 2af3f4de05875a23a7f5dadceaa64e6c0ec84c8b (patch) | |
| tree | 92170452cc0da1c5e506dc85f9335d75662037b7 | |
| parent | 81db1a66aaf17b1355613c9fc5f0888e1140b4a8 (diff) | |
prepare for next release.
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | UPGRADE | 5 | ||||
| -rw-r--r-- | buildscripts/texbuilder/quickstart/quickstart.tex | 2 | ||||
| -rw-r--r-- | framework/PradoBase.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/TClientScriptManager.php | 11 | ||||
| -rw-r--r-- | index.html | 2 |
6 files changed, 19 insertions, 7 deletions
@@ -1,5 +1,5 @@ -Version 3.1.1 To be released -============================ +Version 3.1.1 October 1, 2007 +============================= BUG: Ticket#340 - Callbacks and Firebug compatibility problem (Christophe) BUG: Ticket#533 - HttpRequest::getBrowser() throws an error if browsercap.ini is invalid (Carl) BUG: Ticket#592 - TRadioButton with UniqueGroupName always return false to getChecked (Christophe) @@ -1,5 +1,5 @@ - Upgrading Instructions for PRADO Framework v3.1.1
+ Upgrading Instructions for PRADO Framework v3.1.2
=================================================
!!!IMPORTANT!!!
@@ -9,6 +9,9 @@ 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.1
+---------------------
+
Upgrading from v3.1.0
---------------------
- The RELATIONS declaration in Acive Record classes is changed from
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex index 923b47ca..a2b20a61 100644 --- a/buildscripts/texbuilder/quickstart/quickstart.tex +++ b/buildscripts/texbuilder/quickstart/quickstart.tex @@ -52,7 +52,7 @@ %----------------- TITLE --------------
-\title{\Huge \bfseries PRADO v3.1.1 Quickstart Tutorial
+\title{\Huge \bfseries PRADO v3.1.2 Quickstart Tutorial
\thanks{Copyright 2005-2007. All Rights Reserved.}
}
\author{Qiang Xue and Wei Zhuo}
diff --git a/framework/PradoBase.php b/framework/PradoBase.php index d4f2522c..514a8a9a 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -66,7 +66,7 @@ class PradoBase */
public static function getVersion()
{
- return '3.1.1';
+ return '3.1.2a';
}
/**
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php index 8b2bdae0..6d4775bf 100644 --- a/framework/Web/UI/TClientScriptManager.php +++ b/framework/Web/UI/TClientScriptManager.php @@ -205,7 +205,16 @@ class TClientScriptManager extends TApplicationComponent protected function getPackagePathUrl($base) { $assets = Prado::getApplication()->getAssetManager(); - return array($assets->getPublishedPath($base), $assets->publishFilePath($base)); + if(strpos($base, $assets->getBaseUrl())===false) + { + if(!is_null($dir = Prado::getPathOfNameSpace($base))) + $base = $dir; + return array($assets->getPublishedPath($base), $assets->publishFilePath($base)); + } + else + { + return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base); + } } /** @@ -8,7 +8,7 @@ <body>
<h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.1.1, October 1, 2007<br>
+<p>Version 3.1.2, To be released<br>
Copyright© 2004-2007 by <a href="http://www.pradosoft.com/">PradoSoft</a><br>
All Rights Reserved.
</p>
|