Commit 1735487b authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1528993: Allowing the '&objectionable=1' work with clean urls



behatnotneeded

Change-Id: I88af0659d0140fc9595b15ee3d0771e819e0dee1
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit cce545b7)
parent 142faacc
...@@ -913,7 +913,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin { ...@@ -913,7 +913,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin {
} }
if (empty($this->artefact)) { if (empty($this->artefact)) {
$this->url = $this->view->get_url(false) . '&objection=1'; $this->url = $this->view->get_url(false, true) . '&objection=1';
} }
else { else {
$this->url = 'artefact/artefact.php?artefact=' . $this->artefact->get('id') . '&view=' . $this->view->get('id') . '&objection=1'; $this->url = 'artefact/artefact.php?artefact=' . $this->artefact->get('id') . '&view=' . $this->view->get('id') . '&objection=1';
...@@ -948,7 +948,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin { ...@@ -948,7 +948,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin {
return get_string_from_language( return get_string_from_language(
$user->lang, 'objectionablecontentviewtext', 'activity', $user->lang, 'objectionablecontentviewtext', 'activity',
$this->view->get('title'), display_default_name($this->reporter), $ctime, $this->view->get('title'), display_default_name($this->reporter), $ctime,
$this->message, $this->view->get_url() . "&objection=1", $reporterurl $this->message, $this->view->get_url(true, true) . "&objection=1", $reporterurl
); );
} }
else { else {
...@@ -970,7 +970,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin { ...@@ -970,7 +970,7 @@ class ActivityTypeObjectionable extends ActivityTypeAdmin {
return get_string_from_language( return get_string_from_language(
$user->lang, 'objectionablecontentviewhtml', 'activity', $user->lang, 'objectionablecontentviewhtml', 'activity',
$viewtitle, $reportername, $ctime, $viewtitle, $reportername, $ctime,
$message, $this->view->get_url() . "&objection=1", $viewtitle, $message, $this->view->get_url(true, true) . "&objection=1", $viewtitle,
$reporterurl, $reportername $reporterurl, $reportername
); );
} }
......
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