fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 23:32:54 +09:00
Code Issues Projects Releases Packages Wiki Activity

reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:27:55 +00:00
parent a4b3a914a5
commit f7330acf02
13 changed files with 137 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/page/page.admin.view.php
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');