From 7012130a7c98d602f3408d04c620a69055607781 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 8 Aug 2006 11:56:27 +0000
Subject: Fixed a bug that would prevent from using <prop:> tag in skins

---
 HISTORY                            |  4 ++++
 UPGRADE                            | 44 ++++----------------------------------
 framework/PradoBase.php            |  2 +-
 framework/Web/UI/TThemeManager.php |  6 +++---
 index.html                         |  3 ++-
 5 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/HISTORY b/HISTORY
index f0ff2d4b..e1a68044 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,7 @@
+Version 3.0.4 September 3, 2006
+===============================
+BUG: Fixed a bug that would prevent from using <prop:> tag in skins (Qiang)
+
 Version 3.0.3 August 6, 2006
 ============================
 BUG: Ticket#264 - Typos in some exception throw statements (Knut)
diff --git a/UPGRADE b/UPGRADE
index 6e9c262d..843bf021 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
 
-         Upgrading Instructions for PRADO Framework v3.0.3
+         Upgrading Instructions for PRADO Framework v3.0.4
          =================================================
 
 !!!IMPORTANT!!!
@@ -13,6 +13,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.0.3
+---------------------
+
 
 Upgrading from v3.0.2
 ---------------------
@@ -42,45 +45,6 @@ Upgrading from v3.0.0
 - TControl::onBubbleEvent() has been changed to TControl::bubbleEvent().
   This change only affects user controls that override this method.
 
-Upgrading from v3.0.0 RC2
--------------------------
-- Template comment tag is changed from <! ... !> to <!-- ... --!>
-- Remember to clean up 'assets' directory of your PRADO application
-  as Javascript libraries were updated and client-side validators rewritten.
-
-
-Upgrading from v3.0.0 RC1
--------------------------
-- !!! Expressions appeared in a template are now evaluated in PreRender
-  stage. Previously, for template expressions, they are evaluated during
-  rendering stage, while for property expressions, they are done right
-  after the controls are constructed.
-- !!! The context of the expressions appeared in a template is changed
-  to the template control. Previously, it is the component/control
-  associated with the expression.
-- !!! List controls databound with integer-indexed arrays will have
-  the integers as their list item values. Previously, it used the array
-  values as the list item values.
-
-
-Upgrading from v3.0.0 beta
---------------------------
-- THttpSession.UseCustomStorage replaces the previous Storage.
-- Pagers in TDataGrid are now enclosed within panels. The event indicating
-  their creation is changed to OnPagerCreated instead of OnItemCreated.
-- TTextHighlighter.EnableCopyCode defaults to false now.
-- THtmlArea default toolbar and size are modified.
-- TTarFileExtrator is moved to System.IO
-  Cache classes are moved to System.Caching
-  TXmlDocument is moved to System.Xml
-  TLogger, TLogRouter, TDataFieldAccessor, TSimpleDateFormatter are moved to System.Util
-
-
-Upgrading from v3.0.0 alpha
----------------------------
-All event names must start with 'On'.
-
-
 Upgrading from v2.x and v1.x
 ----------------------------
 PRADO v3.x is not backward compatible with v2.x and v1.x.
\ No newline at end of file
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 7c054bac..30b98f53 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -68,7 +68,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.0.3';
+		return '3.0.4';
 	}
 
 	/**
diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index 245f8049..1d80d0c5 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -292,10 +292,10 @@ class TTheme extends TApplicationComponent implements ITheme
 					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
 					foreach($template->getItems() as $skin)
 					{
-						if($skin[0]!==-1)
-							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
-						else if(!isset($skin[2]))  // a text string, ignored
+						if(!isset($skin[2]))  // a text string, ignored
 							continue;
+						else if($skin[0]!==-1)
+							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
 						$type=$skin[1];
 						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
 						unset($skin[2]['skinid']);
diff --git a/index.html b/index.html
index b353db52..40f439bb 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.0.3, August 6, 2006<br>
+<p>Version 3.0.4, September 3, 2006<br>
 Copyright&copy; 2004-2006 by <a href="http://www.pradosoft.com/">PradoSoft</a><br>
 All Rights Reserved.
 </p>
@@ -46,6 +46,7 @@ The installation is done! You will see the following subdirectories,
   to reside in a Web directory.</li>
   <li>demos - contains several demo applications.</li>
   <li>docs - contains tutorials and documentation.</li>
+  <li>editors - contains editor support for PRADO.</li>
   <li>requirements - contains a requirement checker script that can check if your
   system can run PRADO applications.</li>
 </ul>
-- 
cgit v1.2.3