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

merge from 1.5.3 (~r10951). required minify admin.min.js

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10952 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 03:04:27 +00:00
commit d97822999e
34 changed files with 233 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,8 @@
$output = $this->updateLayout($args);
if(!$output->toBool()) return $output;
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
$this->setRedirectUrl(Context::get('error_return_url'));
return $output;
}
/**

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

@ -84,6 +84,13 @@
// Return xml file informaton after listing up the layout and extra_vars
$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
// If deleted layout files, delete layout instance
// if (!$layout_info) {
// $oLayoutController = &getAdminController('layout');
// $oLayoutController->deleteLayout($layout_srl);
// return;
// }
//insert in cache
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$layout_info);
}