This commit is contained in:
sHa
2018-02-12 14:59:35 +02:00
parent dc92bc18d4
commit 5eec9aa10e

View File

@@ -3,7 +3,7 @@
* *
* @author sHa <sha@shadoll.com> * @author sHa <sha@shadoll.com>
* @package sLetter * @package sLetter
* @version 18.2.13-10 * @version 18.2.13-11
* *
*/ */
@@ -59,9 +59,6 @@ class sLetter{
} }
function setLang($data,$return=false){ function setLang($data,$return=false){
if(empty($this->lang))
$this->loadLanguage();
if(empty($data) || !is_array($data)) if(empty($data) || !is_array($data))
return $return?$this->lang:$this; return $return?$this->lang:$this;
@@ -77,9 +74,12 @@ class sLetter{
function set($data){ function set($data){
if(!empty($data) && is_array($data)) if(!empty($data) && is_array($data))
foreach($data as $key=>$val) foreach($data as $key=>$val){
if(!empty($key) && !empty($val)) if(!empty($key) && !empty($val))
$this->{$key} = is_string($val)?trim(stripslashes($val)):$val; $this->{$key} = is_string($val)?trim(stripslashes($val)):$val;
if($key=='language')
$this->loadLanguage();
}
return $this; return $this;
} }