Changeset 2283

Show
Ignore:
Timestamp:
09/30/2007 07:33:28 PM (16 months ago)
Author:
xue
Message:

prepare for next release.

Location:
trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/HISTORY

    r2276 r2283  
    1 Version 3.1.1 To be released 
    2 ============================ 
     1Version 3.1.1 October 1, 2007 
     2============================= 
    33BUG: Ticket#340 - Callbacks and Firebug compatibility problem (Christophe) 
    44BUG: Ticket#533 - HttpRequest::getBrowser() throws an error if browsercap.ini is invalid (Carl) 

  • trunk/UPGRADE

    r2274 r2283  
    11 
    2          Upgrading Instructions for PRADO Framework v3.1.1 
     2         Upgrading Instructions for PRADO Framework v3.1.2 
    33         ================================================= 
    44 
    … …  
    99version B between A and C, you need to following the instructions 
    1010for both A and B. 
     11 
     12Upgrading from v3.1.1 
     13--------------------- 
    1114 
    1215Upgrading from v3.1.0 

  • trunk/buildscripts/texbuilder/quickstart/quickstart.tex

    r2050 r2283  
    5353%----------------- TITLE -------------- 
    5454 
    55 \title{\Huge \bfseries PRADO v3.1.1 Quickstart Tutorial 
     55\title{\Huge \bfseries PRADO v3.1.2 Quickstart Tutorial 
    5656    \thanks{Copyright 2005-2007. All Rights Reserved.} 
    5757} 

  • trunk/framework/PradoBase.php

    r2241 r2283  
    6767        public static function getVersion() 
    6868        { 
    69                 return '3.1.1'; 
     69                return '3.1.2a'; 
    7070        } 
    7171 

  • trunk/framework/Web/UI/TClientScriptManager.php

    r2252 r2283  
    206206        { 
    207207                $assets = Prado::getApplication()->getAssetManager(); 
    208                 return array($assets->getPublishedPath($base), $assets->publishFilePath($base)); 
     208                if(strpos($base, $assets->getBaseUrl())===false) 
     209                { 
     210                        if(!is_null($dir = Prado::getPathOfNameSpace($base))) 
     211                                $base = $dir; 
     212                        return array($assets->getPublishedPath($base), $assets->publishFilePath($base)); 
     213                } 
     214                else 
     215                { 
     216                        return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base); 
     217                } 
    209218        } 
    210219 

  • trunk/index.html

    r2279 r2283  
    99<body> 
    1010<h1>PRADO Framework for PHP 5 </h1> 
    11 <p>Version 3.1.1, October 1, 2007<br> 
     11<p>Version 3.1.2, To be released<br> 
    1212Copyright&copy; 2004-2007 by <a href="http://www.pradosoft.com/">PradoSoft</a><br> 
    1313All Rights Reserved.