Skip to content
Snippets Groups Projects
Commit 8897e57d authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

use config setting instead of hardwired number, fixes #2294

Closes #2294

Merge request studip/studip!1546
parent 710f175b
No related branches found
No related tags found
No related merge requests found
...@@ -429,10 +429,10 @@ class FilesController extends AuthenticatedController ...@@ -429,10 +429,10 @@ class FilesController extends AuthenticatedController
} }
} elseif ($this->current_view == 'all_files') { } elseif ($this->current_view == 'all_files') {
$this->table_title = _('Alle Dateien'); $this->table_title = _('Alle Dateien');
$this->page_size = 25; $this->page_size = Config::get()->ENTRIES_PER_PAGE;
$this->page = 1; $this->page = 1;
if (!$course_did_change) { if (!$course_did_change) {
$this->page = Request::get('page') + 1; $this->page = Request::int('page') + 1;
} }
if (($this->page < 1) || !$this->page) { if (($this->page < 1) || !$this->page) {
$this->page = 1; $this->page = 1;
...@@ -505,12 +505,12 @@ class FilesController extends AuthenticatedController ...@@ -505,12 +505,12 @@ class FilesController extends AuthenticatedController
$this->files[] = $file_ref->getFileType(); $this->files[] = $file_ref->getFileType();
} }
} elseif ($this->current_view == 'my_uploaded_files') { } elseif ($this->current_view == 'my_uploaded_files') {
$this->page_size = 25; $this->page_size = Config::get()->ENTRIES_PER_PAGE;
$this->page = 1; $this->page = 1;
if (!$course_did_change) { if (!$course_did_change) {
$this->page = Request::get('page') + 1; $this->page = Request::int('page') + 1;
} }
if (($this->page < 1) || !$this->page) { if ($this->page < 1) {
$this->page = 1; $this->page = 1;
} }
$offset = $this->page_size * ($this->page - 1); $offset = $this->page_size * ($this->page - 1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment