Changeset 686 for trunk/lib/Navigation.inc.php

Timestamp:

May 26, 2019 1:59:55 AM (5 years ago)

Author:

anonymous

Message:

Add getHiddenSession() method. Use strstr() instead of strtok() for getting queryless URI.

File:

• trunk/lib/Navigation.inc.php (modified) (1 diff)

trunk/lib/Navigation.inc.php

@@ -440 +440 @@
         }
 
-        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : strtok($_SERVER['REQUEST_URI'], '?');
-        $test_uri = $include_query ? $test_uri : strtok($test_uri, '?');
+        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : (strstr(getenv('REQUEST_URI'), '?', true) ?: getenv('REQUEST_URI')); // strstr() returns false if '?' is not found, so use a shorthand ternary operator.
+        $test_uri = $include_query ? $test_uri : (strstr($test_uri, '?', true) ?: $test_uri); // strstr() returns false if '?' is not found, so use a shorthand ternary operator.
         if (mb_strtolower($test_uri) == mb_strtolower($actual_uri)) {
             // $app->logMsg(sprintf('Current page (%s) == test URI (%s)', $actual_uri, $test_uri), LOG_DEBUG, __FILE__, __LINE__);