fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2601 copy without a title.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11794 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-18 15:35:42 +00:00
parent fef43c6edf
commit 5457426c7d
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -648,14 +648,19 @@
return $this->stop('msg_empty_origin_layout'); return $this->stop('msg_empty_origin_layout');
} }
$oLayoutModel = &getModel('layout');
$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
if(!$sourceArgs->title)
{
$sourceArgs->title = array($layout->title.'_'.$this->_makeRandomMid());
}
if(!is_array($sourceArgs->title) || count($sourceArgs->title) == 0) if(!is_array($sourceArgs->title) || count($sourceArgs->title) == 0)
{ {
return $this->stop('msg_empty_target_layout'); return $this->stop('msg_empty_target_layout');
} }
$oLayoutModel = &getModel('layout');
$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
$output = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars')); $output = $oLayoutModel->getLayoutRawData($sourceArgs->layout_srl, array('extra_vars'));
$args->extra_vars = $output->extra_vars; $args->extra_vars = $output->extra_vars;
$extra_vars = unserialize($args->extra_vars); $extra_vars = unserialize($args->extra_vars);
@ -724,6 +729,19 @@
} }
} }
private function _makeRandomMid()
{
$time = time();
$randomString = "";
for($i=0;$i<4;$i++)
{
$doc = rand()%26+65;
$randomString .= chr($doc);
}
return $randomString.substr($time, -4);
}
/** /**
* Layout file copy * Layout file copy
* @param $sourceLayoutSrl origin layout number * @param $sourceLayoutSrl origin layout number