diff options
Diffstat (limited to 'framework/Web/Services')
| -rw-r--r-- | framework/Web/Services/TJsonService.php | 2 | ||||
| -rw-r--r-- | framework/Web/Services/TPageService.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php index 611a3c22..52997358 100644 --- a/framework/Web/Services/TJsonService.php +++ b/framework/Web/Services/TJsonService.php @@ -136,7 +136,7 @@ class TJsonService extends TService }
}
else
- throw new THttpException(404,'jsonservice_feed_unknown',$id);
+ throw new THttpException(404,'jsonservice_provider_unknown',$id);
}
/**
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php index 4d08ed4c..e4f9804c 100644 --- a/framework/Web/Services/TPageService.php +++ b/framework/Web/Services/TPageService.php @@ -119,7 +119,7 @@ class TPageService extends TService /**
* @var array list of initial page property values
*/
- private $_properties;
+ private $_properties=array();
/**
* @var boolean whether service is initialized
*/
@@ -172,7 +172,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
@@ -857,4 +857,5 @@ class TPageConfiguration extends TComponent $this->_includes[$filePath]=array($configPagePath,$when);
}
}
-}
\ No newline at end of file +}
+
|