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

Timestamp:

Feb 8, 2014 2:29:30 AM (10 years ago)

Author:

anonymous

Message:

Added jsDump function. Updated Navigation::currentPage so test url and curr url both have the option to exclude the query string.

File:

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

trunk/lib/Navigation.inc.php

@@ -279 +279 @@
      * @return  mixed   The value set for $return, TRUE by default.
      */
-    function currentPage($test_uri, $true_return=true, $false_return=false, $include_query=true)
-    {
-        $actual_uri = $include_query ? $_SERVER['REQUEST_URI'] : strtok($_SERVER['REQUEST_URI'], '?');
+    function currentPage($test_uri, $true_return=true, $false_return=false, $strip_query=false)
+    {
+        $actual_uri = $strip_query ? strtok($_SERVER['REQUEST_URI'], '?') : $_SERVER['REQUEST_URI'];
+        $test_uri = $strip_query ? strtok($test_uri, '?') : $test_uri;
         if (preg_match('/^' . preg_quote(urldecode($test_uri), '/') . '$/i', $actual_uri)) {
             return $true_return;