From 8d0e8942eb697b7c9bbbcca6d762f927b4145df1 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 1 Nov 2014 00:54:23 +0000
Subject: [PATCH] [28785] introduced a bug, where encoded query arguments were
 decoded by `parse_str()` inside of `wp_parse_str()` but never re-encoded
 later on.

This encodes them, adds unit test.

Props obenland.
Fixes #29636.

Built from https://develop.svn.wordpress.org/trunk@30133


git-svn-id: http://core.svn.wordpress.org/trunk@30133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 1 +
 wp-includes/version.php          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index bf710041e6..6ecf8271a6 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2475,6 +2475,7 @@ function paginate_links( $args = '' ) {
 
 	if ( isset( $url_parts[1] ) ) {
 		wp_parse_str( $url_parts[1], $query_args );
+		$query_args = urlencode_deep( $query_args );
 	}
 
 	$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e2a6922e93..aa2b562508 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30132';
+$wp_version = '4.1-alpha-30133';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.