diff options
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index bb01158..bf79151 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -112,11 +112,11 @@ class user_ConfigController extends Zend_Controller_Action if(Pbs_Acl::checkRight('cc')){ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID())); $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); - $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); + $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); }else{ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); + $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); } foreach ($this->view->configlist[$b->getID()] as $config){ @@ -128,11 +128,11 @@ class user_ConfigController extends Zend_Controller_Action if(Pbs_Acl::checkRight('cc')){ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID())); $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); - $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); + $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); }else{ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); + $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); } foreach ($this->view->configlist[$b->getID()] as $config){ $config->setCreated(date(Zend_Registry::get('dateformat'),$config->getCreated())); |