reverse merge from 1.6.0 (r10578)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10689 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 09:02:50 +00:00
parent 2b7a348eae
commit ac1783e77f
3 changed files with 9 additions and 5 deletions

View file

@ -254,7 +254,8 @@
Context::set('content', $content);
// Convert them to teach the widget
$oWidgetController = &getController('widget');
$content = $oWidgetController->transWidgetCode($content, true);
$content = $oWidgetController->transWidgetCode($content, true, false);
$content = str_replace('$', '$', $content);
Context::set('page_content', $content);
// Set widget list
$oWidgetModel = &getModel('widget');