summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/3rdParty/WsdlGen/WsdlGenerator.php2
-rw-r--r--framework/I18N/TGlobalizationAutoDetect.php10
-rw-r--r--framework/Web/Services/TSoapService.php2
-rw-r--r--framework/Web/UI/TTemplateManager.php8
4 files changed, 20 insertions, 2 deletions
diff --git a/framework/3rdParty/WsdlGen/WsdlGenerator.php b/framework/3rdParty/WsdlGen/WsdlGenerator.php
index cc18595e..4d6b5686 100644
--- a/framework/3rdParty/WsdlGen/WsdlGenerator.php
+++ b/framework/3rdParty/WsdlGen/WsdlGenerator.php
@@ -269,7 +269,7 @@ class WsdlGenerator
foreach($properties as $property)
{
$comment = $property->getDocComment();
- if($property->isPublic() && strpos($comment, '@soapproperty') !== false)
+ if(strpos($comment, '@soapproperty') !== false)
{
if (preg_match('/@var\s+(\w+(\[\])?)\s+\$(\w+)/mi', $comment, $match)) {
$param = array();
diff --git a/framework/I18N/TGlobalizationAutoDetect.php b/framework/I18N/TGlobalizationAutoDetect.php
index 7393d79a..442135ff 100644
--- a/framework/I18N/TGlobalizationAutoDetect.php
+++ b/framework/I18N/TGlobalizationAutoDetect.php
@@ -25,6 +25,8 @@ Prado::using('System.I18N.core.HTTPNegotiator');
*/
class TGlobalizationAutoDetect extends TGlobalization
{
+ private $_detectedLanguage;
+
public function init($xml)
{
parent::init($xml);
@@ -33,7 +35,15 @@ class TGlobalizationAutoDetect extends TGlobalization
$http = new HTTPNegotiator();
$languages = $http->getLanguages();
if(count($languages) > 0)
+ {
+ $this->_detectedLanguage=$languages[0];
$this->setCulture($languages[0]);
+ }
+ }
+
+ public function getDetectedLanguage()
+ {
+ return $this->_detectedLanguage;
}
}
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index 1472ffc4..e4a1c67e 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -361,7 +361,7 @@ class TSoapServer extends TApplicationComponent
$options['uri']=$this->_uri;
if(is_string($this->_classMap))
{
- foreach(preg_split('/\s?,\s?/', $this->_classMap) as $className)
+ foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className)
$options['classmap'][$className]=$className; //complex type uses the class name in the wsdl
}
return $options;
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index faf0c7fd..ef4a5c1e 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -250,6 +250,14 @@ class TTemplate extends TApplicationComponent implements ITemplate
}
/**
+ * @return string template file path if available, null otherwise.
+ */
+ public function getTemplateFile()
+ {
+ return $this->_tplFile;
+ }
+
+ /**
* @return boolean whether this template is a source template, i.e., this template is loaded from
* some external storage rather than from within another template.
*/