Ticket #17923: 17923_unit_test.2.patch

tests/functions.php

@@ -321 +321 @@
                         $this->assertEquals( "$url&foo=2", add_query_arg( array( 'foo' => '1', 'foo' => '2' ) ) );
                         $this->assertEquals( "$url&foo=1&bar=2", add_query_arg( array( 'foo' => '1', 'bar' => '2' ) ) );
                 }
+                
+                $_SERVER['REQUEST_URI'] = $old_req_uri;
+        }
 
+        /**
+         * Test that encoded URLs work when adding as an array of key=>value
+         * @ticket 17923
+         */
+        public function test_add_query_arg_with_encoding() {
+                $old_req_uri = $_SERVER['REQUEST_URI'];
+
+                $qs_urls = array(
+                        '/?baz',
+                        '/2012/07/30/?baz',
+                        'edit.php?baz',
+                        admin_url( 'edit.php?baz' ),
+                        admin_url( 'edit.php?baz', 'https' ),
+                        admin_url( 'edit.php?baz&za=1' ),
+                        admin_url( 'edit.php?baz=1&za=1' ),
+                        admin_url( 'edit.php?baz=0&za=0' ),
+                );
+                $args = array(
+                        'p' => '456',
+                        'q' => 'abc',
+                        'r' => '&s',
+                        't' => 'u&v',
+                        'w' => '@'
+                );
+                $args_str = 'p=456&q=abc&r&s&t=u&v&w=@';
+                $encoded_args_str = 'p=456&q=abc&r=%26s&t=u%26v&w=%40';
+                foreach ( $qs_urls as $url ) {
+                        $_SERVER['REQUEST_URI'] = $url;
+                        $this->assertEquals( "$url&$args_str", add_query_arg( $args ) );
+                        $this->assertEquals( "$url&$args_str", add_query_arg( $args, $url ) );
+                        $this->assertEquals( "$url&$args_str", add_query_arg( $args, $url ) );
+                        $this->assertEquals( "$url&$encoded_args_str", add_query_arg( $args, false, false, true ) );
+                        $this->assertEquals( "$url&$encoded_args_str", add_query_arg( $args, $url, false, true ) );
+                }
+
+                // Test that encoded URLs work when adding one-by-one
+                $url = '/wordpress/2011/12/08/sample-post';
+                foreach ( $args as $_k => $_v )
+                        $url = add_query_arg( $_k, $_v, $url, true );
+                $this->assertEquals( '/wordpress/2011/12/08/sample-post?p=456&q=abc&r=%26s&t=u%26v&w=%40', $url );
+
+                // Encoded URLs work (e.g. output matches rawurlencode)
+                $url = '/wordpress/';
+                $args = '!@#$%^&*()_+=-[]{}\|";:\',.<>/?`~';
+                $this->assertEquals( $url . '?args=' . $args, add_query_arg('args', $args, $url) );
+                $this->assertEquals( $url . '?args=' . rawurlencode($args), add_query_arg('args', $args, $url, true) );
+
                 $_SERVER['REQUEST_URI'] = $old_req_uri;
         }
+        
+        public function test_remove_arg() {
 
+                // Arg from the end
+                $url = '/wordpress/?p=123';
+                $this->assertEquals( '/wordpress/', remove_query_arg('p', $url) );
+
+                // Arg from the middle
+                $url = '/wordpress/?p=123&q=456&r&s';
+                $this->assertEquals( '/wordpress/?p=123&q=456&s', remove_query_arg('r', $url) );        
+
+                // Multiple calls
+                $url = '/wordpress/?p=123&q=456&r&s';
+                $url = remove_query_arg('s', $url);
+                $url = remove_query_arg('r', $url);
+                $url = remove_query_arg('q', $url);
+                $url = remove_query_arg('p', $url);
+                $this->assertEquals( '/wordpress/', $url );     
+        
+                // Trailing ampersand
+                $url = '/wordpress/?p=123&';
+                $this->assertEquals( '/wordpress/', remove_query_arg('p', $url) );
+                
+                // From REQUEST_URI
+                $old_request_uri = $_SERVER['REQUEST_URI'];
+                $_SERVER['REQUEST_URI'] = '/wordpress/?p=123&q=456&r&s';
+                $url = remove_query_arg('s');
+                $url = remove_query_arg('r', $url);
+                $url = remove_query_arg('q', $url);
+                $url = remove_query_arg('p', $url);
+                $this->assertEquals( '/wordpress/', $url );
+                $_SERVER['REQUEST_URI'] = $old_request_uri;
+        }
+
         /**
          * @ticket 21594
          */