summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authorroot2011-05-30 16:58:26 +0200
committerroot2011-05-30 16:58:26 +0200
commit8d4bde45739a78561801b189efc18092ce7f21c9 (patch)
tree6205732708237d5f0d453c1f1ec73b880e348114 /application/modules/user
parentfilterAPI test (diff)
parentGetBootOS API Test (diff)
downloadpbs2-8d4bde45739a78561801b189efc18092ce7f21c9.tar.gz
pbs2-8d4bde45739a78561801b189efc18092ce7f21c9.tar.xz
pbs2-8d4bde45739a78561801b189efc18092ce7f21c9.zip
Merge branch 'master' of openslx.org:lsfks/projekte/pbs2
Conflicts: application/controllers/ResourceController.php
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/GroupController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index a262375..66fe02b 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -289,7 +289,7 @@ class User_GroupController extends Zend_Controller_Action
if(is_array($membersList)) {
// Member Pagination
$memberPagination = new Pbs_Pagination();
- $memberPagination->setPerPage(10);
+ $memberPagination->setPerPage(10)
->setElement($membersList)
->setRequestPage($this->_request->getParam('page'));
if($this->_request->getParam('groupID')) {