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

merge from 1.5.3.2 for hotfix (r11067, r11069, r11070, r11073)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@11074 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-08-23 04:28:20 +00:00
parent 31be172d7f
commit 8ee56fff9f
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/layout/layout.admin.controller.php
View file

@ -630,6 +630,12 @@
$oLayoutModel = &getModel('layout');
$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
$args->extra_vars = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
$extra_vars = unserialize($args->extra_vars);
$oModuleController = &getController('module');
$layout_config->header_script = $extra_vars->header_script;
// Get information to create a layout
$args->site_srl = (int)$layout->site_srl;
$args->layout = $layout->layout;
@ -651,6 +657,9 @@
$args->layout_srl = getNextSequence();
$args->title = $value;
// for header script
$oModuleController->insertModulePartConfig('layout', $args->layout_srl, $layout_config);
// Insert into the DB
$output = $this->insertLayout($args);
if(!$output->toBool())
@ -663,7 +672,6 @@
$this->initLayout($args->layout_srl, $args->layout);
// update layout info
$args->extra_vars = $layout->extra_var;
$output = $this->updateLayout($args);
if (!$output->toBool())
{

10
modules/layout/layout.model.php
View file

@ -97,6 +97,16 @@
return $layout_info;
}
function getLayoutRawData($layout_srl, $columnList = array())
{
$args->layout_srl = $layout_srl;
$output = executeQuery('layout.getLayout', $args, $columnList);
if(!$output->toBool())
return;
return $output->data->extra_vars;
}
/**
* Get a layout path
* @param string $layout_name

4
modules/menu/menu.admin.controller.php
View file

@ -815,7 +815,7 @@
$link = '<?php print $_names[$lang_type]; ?>';
}
// If the value of node->group_srls exists
if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls === -1?'TRUE':'FALSE');
if($group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged&&%s))',$group_srls,$group_srls == -1?1:0);
else $group_check_code = "true";
$attribute = sprintf(
'node_srl="%s" parent_srl="%s" text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?"%s":"")?>" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
@ -874,7 +874,7 @@
if($node->url) $child_output['url_list'][] = $node->url;
$output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
// If node->group_srls value exists
if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls === -1?'TRUE':'FALSE');
if($node->group_srls)$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s))))||($is_logged && %s))',$node->group_srls,$node->group_srls == -1?1:0);
else $group_check_code = "true";
// List variables
$href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);