diff options
| -rw-r--r-- | framework/3rdParty/WsdlGen/Wsdl.php | 3 | ||||
| -rw-r--r-- | framework/I18N/core/HTTPNegotiator.php | 6 | 
2 files changed, 7 insertions, 2 deletions
| diff --git a/framework/3rdParty/WsdlGen/Wsdl.php b/framework/3rdParty/WsdlGen/Wsdl.php index 55694438..4b94fbb4 100644 --- a/framework/3rdParty/WsdlGen/Wsdl.php +++ b/framework/3rdParty/WsdlGen/Wsdl.php @@ -107,7 +107,8 @@ class Wsdl                       xmlns:xsd="http://www.w3.org/2001/XMLSchema"                       xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/"></definitions>'; -		$dom = DOMDocument::loadXml($xml); +		$dom = new DOMDocument(); +		$dom->loadXml($xml);  		$this->definitions = $dom->documentElement;  		$this->addTypes($dom); diff --git a/framework/I18N/core/HTTPNegotiator.php b/framework/I18N/core/HTTPNegotiator.php index f5eb876c..31639a99 100644 --- a/framework/I18N/core/HTTPNegotiator.php +++ b/framework/I18N/core/HTTPNegotiator.php @@ -62,6 +62,8 @@ class HTTPNegotiator  		//$basedir = CultureInfo::dataDir();
  		//$ext = CultureInfo::fileExt();
 +		$info = new CultureInfo();
 +
  		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang) 
  		{
              // Cut off any q-value that might come after a semi-colon
 @@ -91,7 +93,9 @@ class HTTPNegotiator  				}
              }
 -			if(CultureInfo::validCulture($lang))
 +
 +
 +			if($info->validCulture($lang))
  				$this->languages[] = $lang;
          }
 | 
