Commit 18cf717d authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review

Merge "Bug 1850560: Need to have the plan task 'page' button use normal urls"

parents f7632dbe fcfc19a0
......@@ -853,14 +853,14 @@ class PlansTools {
switch ($portfolioElementType) {
case 'view':
return $portfolioElement->get_url();
return $portfolioElement->get_url(true, true);
case 'collection':
// To circumvent the log_warn in the get_url() for an empty collection
if (empty($portfolioElement->views())) {
return get_config('wwwroot') . 'collection/views.php?id=' . $portfolioElement->get('id');
}
else {
return $portfolioElement->get_url();
return $portfolioElement->get_url(true, true);
}
default:
throw new \MaharaException(get_string('unsupportedportfoliotype','artefact.plans'));
......
......@@ -1011,7 +1011,7 @@ function getUrlParameter(param, url) {
}
var vars = url.split("?");
if (!vars[1]) return null; // no search parameters
if (!vars[1]) return null; // no search parameters - are you using clean URLs?
varparams = vars[1].split("&");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment