summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael pereira2011-04-22 22:02:20 +0200
committermichael pereira2011-04-22 22:02:20 +0200
commit38278e7413583c3dd5ae416e3e47a13ff37d3bf0 (patch)
tree5e32cdea37b27f3f5a3ea44be98114c5af327be9
parentmerge (diff)
downloadpbs2-38278e7413583c3dd5ae416e3e47a13ff37d3bf0.tar.gz
pbs2-38278e7413583c3dd5ae416e3e47a13ff37d3bf0.tar.xz
pbs2-38278e7413583c3dd5ae416e3e47a13ff37d3bf0.zip
ressource fix
-rw-r--r--application/controllers/ResourceController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index b080a3d..6344a6e 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -59,7 +59,7 @@ class ResourceController extends Zend_Controller_Action
$session->setBootosID($bootmenuentry->getBootosID())
->setBootmenuentryID($bootmenuentry->getID())
->setTime(time())
- ->setMembershipID($bootosMapper->find($bootmenuentry->getBootmenuID())->getMembershipID())
+ ->setMembershipID($bootosMapper->find($bootmenuentry->getBootosID())->getMembershipID())
->setIp($_SERVER['REMOTE_ADDR'])
->setAlphasessionID('0');
@@ -412,7 +412,7 @@ class ResourceController extends Zend_Controller_Action
}else {
if($configID == null)
$configID = 'default';
- chdir("../resources/config/$bootosID/$configID/");
+ chdir("../resources/config/$configID/");
passthru( "cat default.tgz");
}