mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 01:01:41 +09:00
Fix undefined variables in layout admin view/model
This commit is contained in:
parent
04f5ecbf41
commit
b7def41ec4
2 changed files with 2 additions and 7 deletions
|
|
@ -26,7 +26,7 @@ class LayoutAdminModel extends Layout
|
|||
$script = '<script src="./modules/layout/tpl/js/layout_modify.js"></script>';
|
||||
$oTemplate = TemplateHandler::getInstance();
|
||||
$html = $oTemplate->compile($this->module_path.'tpl/', 'layout_info_view');
|
||||
|
||||
$csss = '';
|
||||
preg_match_all('/<!--#JSPLUGIN:(.*)-->/', $html, $m);
|
||||
$pluginList = $m[1];
|
||||
|
||||
|
|
@ -49,11 +49,6 @@ class LayoutAdminModel extends Layout
|
|||
}
|
||||
|
||||
$this->add('html', $csss . $script . $html);
|
||||
|
||||
if($isReturn)
|
||||
{
|
||||
return $this->get('html');
|
||||
}
|
||||
}
|
||||
|
||||
public function setLayoutAdminSetInfoView()
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ class LayoutAdminView extends Layout
|
|||
$faceoffcss = $oLayoutModel->_getUserLayoutFaceOffCss($current_module_info->layout_srl);
|
||||
|
||||
$css = FileHandler::readFile($faceoffcss);
|
||||
$match = null;
|
||||
$style = [];
|
||||
preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match);
|
||||
for($i=0,$c=count($match[1]);$i<$c;$i++)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue