Changeset 524

Timestamp:

May 24, 2015 5:56:37 PM (9 years ago)

Author:

anonymous

Message:

 

Location:

trunk

Files:

• docs/version.txt (modified) (1 diff)
• lib/App.inc.php (modified) (2 diffs)

trunk/docs/version.txt

@@ -1 @@
-2.1.10
+2.2.0dev

trunk/lib/App.inc.php

@@ -1003 +1003 @@
             }
         }
+
+        // Pop off any named anchors to push them back on after appending additional query args.
+        $parts = explode('#', $url, 2);
+        $url = $parts[0];
+        $anchor = isset($parts[1]) ? $parts[1] : '';
+
+        // $anchor =
 
         // Include the necessary SID if the following is true:
@@ -1032 +1039 @@
             && !preg_match('/[?&]' . preg_quote(session_name()) . '=/', $url)
         ) {
-            $url .= $q . $delim . session_name() . '=' . session_id();
+            $url = sprintf('%s%s%s%s=%s%s', $url, $q, $delim, session_name(), session_id(), ('' == $anchor ? '' : "#$anchor"));
         } else {
-            $url .= $q;
+            $url = sprintf('%s%s%s', $url, $q, ('' == $anchor ? '' : "#$anchor"));
         }