merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -50,6 +50,7 @@
}
}
Context::set('l', Context::getLangType());
$this->setTemplateFile('introduce');
}
@ -60,7 +61,6 @@
$this->setTemplateFile('check_env');
}
/**
* @brief Choose a DB
**/