- bugfix for $smarty->config_overwrite = false

This commit is contained in:
Uwe.Tews
2009-11-24 20:33:40 +00:00
parent 4925a98949
commit 2bab2f147d
3 changed files with 16 additions and 5 deletions

View File

@@ -856,14 +856,14 @@ static public $yy_action = array(
$value = false;
}
if ($this->current_section == null) {
if ($this->smarty->config_overwrite) {
if ($this->smarty->config_overwrite || !isset($this->compiler->config_data['vars'][$this->yystack[$this->yyidx + -3]->minor])) {
$this->compiler->config_data['vars'][$this->yystack[$this->yyidx + -3]->minor]=$value;
} else {
settype($this->compiler->config_data['vars'][$this->yystack[$this->yyidx + -3]->minor], 'array');
$this->compiler->config_data['vars'][$this->yystack[$this->yyidx + -3]->minor][]=$value;
}
} else {
if ($this->smarty->config_overwrite) {
if ($this->smarty->config_overwrite || !isset($this->compiler->config_data['sections'][$this->current_section]['vars'][$this->yystack[$this->yyidx + -3]->minor])) {
$this->compiler->config_data['sections'][$this->current_section]['vars'][$this->yystack[$this->yyidx + -3]->minor]=$value;
} else {
settype($this->compiler->config_data['sections'][$this->current_section]['vars'][$this->yystack[$this->yyidx + -3]->minor], 'array');