From 38d388920b3b947deeb0ce5fd037f1afa5fbc844 Mon Sep 17 00:00:00 2001 From: "christophe.boulain" <> Date: Tue, 6 Jan 2009 14:38:07 +0000 Subject: Fixed Issue#9 : Global page properties are ignored when using external configuration --- HISTORY | 1 + framework/Web/Services/TPageService.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 16f2ea83..2ac82ba7 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,6 @@ Version 3.1.4 To be released ============================== +BUG: Issue#9 - Global page properties are ignored when using external configuration (Christophe) BUG: Issue#59 - TPropertyAccess::has() returns false even if the property of an object was found (Carl) BUG: Issue#61 - TLogRouter throws exception when using external config file (Michael) BUG: Issue#62 - Some mistyping: TJavascript or TJavaScript? (Carl) diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php index 89c5bb37..e35fb0e3 100644 --- a/framework/Web/Services/TPageService.php +++ b/framework/Web/Services/TPageService.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.Services @@ -114,7 +114,7 @@ class TPageService extends TService /** * @var array list of initial page property values */ - private $_properties; + private $_properties=array(); /** * @var boolean whether service is initialized */ @@ -167,7 +167,7 @@ class TPageService extends TService protected function applyConfiguration($config) { // initial page properties (to be set when page runs) - $this->_properties=$config->getProperties(); + $this->_properties=array_merge($this->_properties, $config->getProperties()); $this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules()); $pagePath=$this->getRequestedPagePath(); // external configurations -- cgit v1.2.3