From fcbea5e77e7eec8dbe9e07c96b2001bb22d1b52d Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Tue, 26 Apr 2011 18:05:19 +0200
Subject: config fix

---
 application/modules/user/controllers/ConfigController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'application')

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()));
-- 
cgit v1.2.3-55-g7522