summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-28 12:06:30 +0200
committerBjörn Geiger2011-10-28 12:06:30 +0200
commit98c3377e145ff0ee36f2df81ddfc051857166735 (patch)
tree1910d10ede61978a65350283cf6562f7cb66a544
parentControllerWorker.jar update (diff)
downloadpoolctrl-98c3377e145ff0ee36f2df81ddfc051857166735.tar.gz
poolctrl-98c3377e145ff0ee36f2df81ddfc051857166735.tar.xz
poolctrl-98c3377e145ff0ee36f2df81ddfc051857166735.zip
verschiedenes
-rwxr-xr-xapplication/controllers/PersonController.php10
-rwxr-xr-xgearman/controllerWorker.jarbin939818 -> 939818 bytes
2 files changed, 7 insertions, 3 deletions
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 75bec62..9fe0257 100755
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -37,8 +37,13 @@ class PersonController extends Zend_Controller_Action
break;
}
}
- foreach(Zend_Session::namespaceGet('memberships') as $membership) {
- $this->memberships[$membership->getID()] = $membership;
+ $membershipNamespace = Zend_Session::namespaceGet('memberships');
+ if(count($membershipNamespace) == 1) {
+ $this->memberships[0] = $membershipNamespace[0];
+ } else {
+ foreach($membershipNamespace as $membership) {
+ $this->memberships[$membership->getID()] = $membership;
+ }
}
if(count($this->memberships) > 0) {
if(isset($this->userIDsNamespace['membershipID'])) {
@@ -80,7 +85,6 @@ class PersonController extends Zend_Controller_Action
$group->setID(sprintf("%s", $groupXML->group->id));
$group->setTitle(sprintf("%s", $groupXML->group->title));
$group->setDescription(sprintf("%s", $groupXML->group->description));
-
$groupSession->$groupID = $group;
}
}
diff --git a/gearman/controllerWorker.jar b/gearman/controllerWorker.jar
index 842e0b5..ca822bd 100755
--- a/gearman/controllerWorker.jar
+++ b/gearman/controllerWorker.jar
Binary files differ