MDL-28945 course_reports: Fixed up pagination issue

diff --git a/course/report/completion/index.php b/course/report/completion/index.php
index 0118cf1..af07f65 100644 (file)
--- a/course/report/completion/index.php
+++ b/course/report/completion/index.php
@@ -274,9 +274,13 @@ if($total > COMPLETION_REPORT_PAGE) {
     $pagingbar .= get_string('page').': ';
 
     $sistrings = array();
-    $sistrings[] = $sifirst != 'all' ? "sifirst={$sifirst}" : null;
-    $sistrings[] = $silast != 'all' ? "silast={$silast}" : null;
-    $sistring = !empty($sistrings) ? implode('&', $sistrings) : '';
+    if ($sifirst != 'all') {
+        $sistrings[] =  "sifirst={$sifirst}";
+    }
+    if ($silast != 'all') {
+        $sistrings[] =  "silast={$silast}";
+    }
+    $sistring = !empty($sistrings) ? '&'.implode('&', $sistrings) : '';
 
     // Display previous link
     if ($start > 0) {

diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index a45a643..323d2b8 100644 (file)
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -206,9 +206,13 @@ if($total > COMPLETION_REPORT_PAGE) {
     $pagingbar .= get_string('page').': ';
 
     $sistrings = array();
-    $sistrings[] = $sifirst != 'all' ? "sifirst={$sifirst}" : null;
-    $sistrings[] = $silast != 'all' ? "silast={$silast}" : null;
-    $sistring = !empty($sistrings) ? implode('&', $sistrings) : '';
+    if ($sifirst != 'all') {
+        $sistrings[] =  "sifirst={$sifirst}";
+    }
+    if ($silast != 'all') {
+        $sistrings[] =  "silast={$silast}";
+    }
+    $sistring = !empty($sistrings) ? '&'.implode('&', $sistrings) : '';
 
     // Display previous link
     if ($start > 0) {