Commit 313180b6 authored by Robert Lyon's avatar Robert Lyon Committed by Aaron Wells
Browse files

Need to check if QUERY_STRING exists (Bug #1426980)



Change-Id: I0a369a0ae0a710570992b6e368b55c62732c49c6
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 3a0a2ec0
...@@ -87,7 +87,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact { ...@@ -87,7 +87,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact {
if (!(strpos($_SERVER['REQUEST_URI'], $searchFor) === false)) { if (!(strpos($_SERVER['REQUEST_URI'], $searchFor) === false)) {
// set new path // set new path
$redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/lib/activity.php'; $redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/lib/activity.php';
if (strlen($_SERVER['QUERY_STRING'])>0) { if (!empty($_SERVER['QUERY_STRING'])) {
// change path // change path
$redirTarget .= '?' . $_SERVER['QUERY_STRING']; $redirTarget .= '?' . $_SERVER['QUERY_STRING'];
} }
...@@ -99,7 +99,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact { ...@@ -99,7 +99,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact {
if ((preg_match($searchFor, $_SERVER['REQUEST_URI'])) == 1) { if ((preg_match($searchFor, $_SERVER['REQUEST_URI'])) == 1) {
// set new path // set new path
$redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/inbox.php'; $redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/inbox.php';
if (strlen($_SERVER['QUERY_STRING'])>0) { if (!empty($_SERVER['QUERY_STRING'])) {
// change path // change path
$redirTarget .='?' . $_SERVER['QUERY_STRING']; $redirTarget .='?' . $_SERVER['QUERY_STRING'];
} }
...@@ -111,7 +111,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact { ...@@ -111,7 +111,7 @@ class PluginArtefactMultirecipientnotification extends PluginArtefact {
if ((preg_match($searchFor, $_SERVER['REQUEST_URI'])) == 1) { if ((preg_match($searchFor, $_SERVER['REQUEST_URI'])) == 1) {
// set new path // set new path
$redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/sendmessage.php'; $redirTarget = get_config('wwwroot') . 'artefact/multirecipientnotification/sendmessage.php';
if (strlen($_SERVER['QUERY_STRING']) > 0) { if (!empty($_SERVER['QUERY_STRING'])) {
// change path // change path
$redirTarget .= '?' . $_SERVER['QUERY_STRING']; $redirTarget .= '?' . $_SERVER['QUERY_STRING'];
} }
......
Supports Markdown
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