merge from branch 1.5.3.2 (~r12279)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12282 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-22 06:41:02 +00:00
commit 7e118f8533
14 changed files with 206 additions and 87 deletions

View file

@ -59,6 +59,9 @@
Context::set('status_name_list', $statusNameList);
Context::set('page_navigation', $output->page_navigation);
$oSecurity = new Security();
$oSecurity->encodeHTML('document_list..variables.');
// set a search option used in the template
$count_search_option = count($this->search_option);
for($i=0;$i<$count_search_option;$i++) {