Changeset 608 for branches/1.1dev/lib/App.inc.php

Timestamp:

Jul 13, 2017 1:50:49 PM (7 years ago)

Author:

anonymous

Message:

Fix undefined index errors

File:

• branches/1.1dev/lib/App.inc.php (modified) (1 diff)

branches/1.1dev/lib/App.inc.php

@@ -198 +198 @@
 
     if (isset($url) && is_string($url)) {
-        // Delete any boomerang request keys in the query string.
-        $url = preg_replace('/boomerang=[\w]+/', '', $url);
-
-        if (is_array($_SESSION['_boomerang']['url']) && !empty($_SESSION['_boomerang']['url'])) {
+        // Delete any boomerang request keys in the query string (along with any trailing delimiters after the deletion).
+        $url = preg_replace(array('/([&?])boomerang=[^&?]+[&?]?/', '/[&?]$/'), array('$1', ''), $url);
+
+        if (isset($_SESSION['_boomerang']['url']) && is_array($_SESSION['_boomerang']['url']) && !empty($_SESSION['_boomerang']['url'])) {
             // If the URL currently exists in the boomerang array, delete.
             while ($existing_key = array_search($url, $_SESSION['_boomerang']['url'])) {