From 2d285e60d14ae253168dd7cfd9e4578596f61f47 Mon Sep 17 00:00:00 2001 From: ovclas Date: Thu, 5 Jul 2012 05:49:57 +0000 Subject: [PATCH] issue 2003 fix checkbox value (string to array) git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10835 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.controller.php | 9 ++++++--- modules/module/tpl/include.manage_selected.html | 2 +- modules/module/tpl/include.module_grant_setup.html | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 5edecd520..54af47477 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -396,9 +396,12 @@ } else { $group_srls = Context::get($grant_name); if($group_srls) { - if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls); - elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls); - else $group_srls = array($group_srls); + if(!is_array($group_srls)) + { + if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls); + elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls); + else $group_srls = array($group_srls); + } $grant->{$grant_name} = $group_srls; } continue; diff --git a/modules/module/tpl/include.manage_selected.html b/modules/module/tpl/include.manage_selected.html index a6c7389f5..041990027 100644 --- a/modules/module/tpl/include.manage_selected.html +++ b/modules/module/tpl/include.manage_selected.html @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/modules/module/tpl/include.module_grant_setup.html b/modules/module/tpl/include.module_grant_setup.html index c96c9a582..2379ee747 100644 --- a/modules/module/tpl/include.module_grant_setup.html +++ b/modules/module/tpl/include.module_grant_setup.html @@ -32,7 +32,7 @@