Changeset 286 for tags/2.0.2

Timestamp:

Oct 21, 2007 1:01:28 AM (17 years ago)

Author:

quinn

Message:

 

File:

• tags/2.0.2/lib/App.inc.php (modified) (3 diffs)

tags/2.0.2/lib/App.inc.php

@@ -668 +668 @@
         // Get the first delimiter that is needed in the url.
         $delim = strpos($url, '?') !== false ? ini_get('arg_separator.output') : '?';
-
+        
+        // Separate any #anchor component.
+        preg_match('/^([^#]+)#([^#]+)$/i', $url, $anchor_match);
+        if (isset($anchor_match[2])) {
+            $url = $anchor_match[1];
+            $anchor = '#' . $anchor_match[2];
+        } else {
+            $anchor = '';
+        }
 
         $q = '';
@@ -674 +682 @@
             // Join the global _carry_queries and local one_time_carry_queries.
             $query_args = urlEncodeArray(array_merge($_this->_carry_queries, $one_time_carry_queries));
-            foreach ($query_args as $key=>$val) {
+            foreach ($query_args as $key => $val) {
                 // Check value is set and value does not already exist in the url.
                 if (!preg_match('/[?&]' . preg_quote($key) . '=/', $url)) {
@@ -711 +719 @@
             && !preg_match('/[?&]' . preg_quote(session_name()) . '=/', $url)
         ) {
-            $url .= $q . $delim . session_name() . '=' . session_id();
-            return $url;
-        } else {
-            $url .= $q;
-            return $url;
-        }
+            $q .= $delim . session_name() . '=' . session_id();
+        }
+
+        return $url . $q . $anchor;
     }