Merge "Fix pagination base url for plans block on dashboard (bug #881718)"

htdocs/artefact/plans/blocktype/plans/lib.php

@@ -79,8 +79,10 @@ class PluginBlocktypePlans extends PluginBlocktype {
                 $pagination = false;
             }
             else {
+                $baseurl = $instance->get_view()->get_url();
+                $baseurl .= ((false === strpos($baseurl, '?')) ? '?' : '&') . 'block=' . $blockid;
                 $pagination = array(
-                    'baseurl'   => $instance->get_view()->get_url() . '&block=' . $blockid,
+                    'baseurl'   => $baseurl,
                     'id'        => 'block' . $blockid . '_pagination',
                     'datatable' => 'tasktable_' . $blockid,
                     'jsonscript' => 'artefact/plans/viewtasks.json.php',

htdocs/artefact/plans/viewtasks.json.php

@@ -46,8 +46,10 @@ if ($blockid = param_integer('block', null)) {
     $tasks = ArtefactTypeTask::get_tasks($configdata['artefactid'], $offset, $limit);
 
     $template = 'artefact:plans:taskrows.tpl';
+    $baseurl = $bi->get_view()->get_url();
+    $baseurl .= ((false === strpos($baseurl, '?')) ? '?' : '&') . 'block=' . $blockid;
     $pagination = array(
-        'baseurl'   => $bi->get_view()->get_url() . '&block=' . $blockid,
+        'baseurl'   => $baseurl,
         'id'        => 'block' . $blockid . '_pagination',
         'datatable' => 'tasktable_' . $blockid,
         'jsonscript' => 'artefact/plans/viewtasks.json.php',