summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-05 10:51:38 +0200
committerBjörn Geiger2011-08-05 10:51:38 +0200
commit8efb34b8e6495a2fab2c08651f43a52236da56ad (patch)
tree8a14a74741d77d62f0f5255f824c3b68f2985190 /application/controllers
parentFehler korrigiert (diff)
downloadpoolctrl-8efb34b8e6495a2fab2c08651f43a52236da56ad.tar.gz
poolctrl-8efb34b8e6495a2fab2c08651f43a52236da56ad.tar.xz
poolctrl-8efb34b8e6495a2fab2c08651f43a52236da56ad.zip
weiteren Fehler korrigiert
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ErrorController.php1
-rw-r--r--application/controllers/EventController.php2
-rw-r--r--application/controllers/GearmanController.php1
-rw-r--r--application/controllers/IndexController.php1
-rw-r--r--application/controllers/PersonController.php1
5 files changed, 5 insertions, 1 deletions
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index f9b9178..3866450 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -7,6 +7,7 @@ class ErrorController extends Zend_Controller_Action
public function errorAction()
{
+ $bootstrap = $this->getInvokeArg('bootstrap');
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 3c7fa69..997733c 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -23,6 +23,7 @@ class EventController extends Zend_Controller_Action
public function init()
{
if (Zend_Auth::getInstance()->hasIdentity()) {
+ $bootstrap = $this->getInvokeArg('bootstrap');
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
$this->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
@@ -31,7 +32,6 @@ class EventController extends Zend_Controller_Action
$this->eventcategoryMapper = new Application_Model_EventcategoryMapper();
$this->eventactionMapper = new Application_Model_EventactionMapper();
$this->membershipMapper = new Application_Model_MembershipMapper();
- $bootstrap = $this->getInvokeArg('bootstrap');
} else {
$this->_helper->redirector('selectmembership', 'person');
return;
diff --git a/application/controllers/GearmanController.php b/application/controllers/GearmanController.php
index 3775996..dcad3dc 100644
--- a/application/controllers/GearmanController.php
+++ b/application/controllers/GearmanController.php
@@ -10,6 +10,7 @@ class GearmanController extends Zend_Controller_Action
{
if (Zend_Auth::getInstance()->hasIdentity()) {
+ $bootstrap = $this->getInvokeArg('bootstrap');
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
$this->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 1321c14..f04aad4 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -7,6 +7,7 @@ class IndexController extends Zend_Controller_Action
public function init()
{
+ $bootstrap = $this->getInvokeArg('bootstrap');
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
}
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index f701a8e..91ced77 100644
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -23,6 +23,7 @@ class PersonController extends Zend_Controller_Action
public function init()
{
if (Zend_Auth::getInstance()->hasIdentity()) {
+ $bootstrap = $this->getInvokeArg('bootstrap');
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
$this->userIDsNamespace = Zend_Session::namespaceGet('userIDs');