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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/page/page.admin.controller.php
View file

@ -24,6 +24,8 @@
$args = Context::getRequestVars();
$args->module = 'page';
$args->mid = $args->page_name; //because if mid is empty in context, set start page mid
$args->path = (!$args->path) ? '' : $args->path;
$args->mpath = (!$args->mpath) ? '' : $args->mpath;
unset($args->page_name);
if($args->use_mobile != 'Y') $args->use_mobile = '';
@ -244,9 +246,17 @@
$oWidgetController->recompileWidget($content);
}
function procPageAdminArticleDocumentInsert(){
function procPageAdminArticleDocumentInsert()
{
$logged_info = Context::get('logged_info');
if ($logged_info->is_admin != 'Y')return new Object(-1, 'msg_not_permitted');
$oModuleModel = &getModel('module');
$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
if (!$grant->manager)
{
return new Object(-1, 'msg_not_permitted');
}
$obj = Context::getRequestVars();
$obj->module_srl = $this->module_info->module_srl;