merged 1.5.0 branch into 1.5.0-DB

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8547 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-06-29 15:36:09 +00:00
parent 4973c78fbc
commit 01d0925dd5
145 changed files with 990 additions and 31147 deletions

View file

@ -37,8 +37,7 @@
Context::set('system_message', nl2br($this->getMessage()));
$this->setTemplatePath($template_path);
$this->setTemplateFile('system_message');
$this->setTemplateFile('system_message');
}
}
?>

View file

@ -1,8 +1,8 @@
<!--%import("filter/insert_config.xml")-->
<h3 class="xeAdmin">{$lang->message} <span class="gray">{$lang->cmd_management}</span></h3>
<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
<form action="./" method="post">
<input type="hidden" name="act" value="procMessageAdminInsertConfig" />
<p class="summary">{$lang->about_skin}</p>
<table cellspacing="0" class="rowTable">
<tr>