merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -230,10 +230,10 @@
/**
* @breif By converting the specific content of the widget tag return
**/
function transWidgetCode($content, $javascript_mode = false) {
function transWidgetCode($content, $javascript_mode = false, $isReplaceLangCode = true) {
// Changing user-defined language
$oModuleController = &getController('module');
$oModuleController->replaceDefinedLangCode($content);
$oModuleController->replaceDefinedLangCode($content, $isReplaceLangCode);
// Check whether to include information about editing
$this->javascript_mode = $javascript_mode;
// Widget code box change